mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-15 06:55:13 +08:00
2bcef9b457
Seval of-enabled machines (bmips, lantiq, xlp, pistachio, ralink) copied the arguments from dtb to arcs_command_line to prevent the kernel from overwriting them. Since there is now an option to keep the dtb arguments, default to the new option remove the "backup" to arcs_command_line in case of USE_OF is enabled, except for those platforms that still take the bootloader arguments or do not use any at all. Signed-off-by: Jonas Gorski <jogo@openwrt.org> Cc: linux-mips@linux-mips.org Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: John Crispin <blogic@openwrt.org> Cc: Ganesan Ramalingam <ganesanr@broadcom.com> Cc: Jayachandran C <jchandra@broadcom.com> Cc: Andrew Bresticker <abrestic@chromium.org> Cc: James Hartley <james.hartley@imgtec.com> Patchwork: https://patchwork.linux-mips.org/patch/11285/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
110 lines
3.1 KiB
C
110 lines
3.1 KiB
C
/*
|
|
* Copyright 2003-2013 Broadcom Corporation.
|
|
* All Rights Reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the Broadcom
|
|
* license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY BROADCOM ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
|
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
|
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
|
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/bootmem.h>
|
|
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/of_device.h>
|
|
|
|
#include <asm/prom.h>
|
|
|
|
extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[], __dtb_xlp_fvp_begin[],
|
|
__dtb_xlp_gvp_begin[], __dtb_xlp_rvp_begin[];
|
|
static void *xlp_fdt_blob;
|
|
|
|
void __init *xlp_dt_init(void *fdtp)
|
|
{
|
|
if (!fdtp) {
|
|
switch (current_cpu_data.processor_id & PRID_IMP_MASK) {
|
|
#ifdef CONFIG_DT_XLP_RVP
|
|
case PRID_IMP_NETLOGIC_XLP5XX:
|
|
fdtp = __dtb_xlp_rvp_begin;
|
|
break;
|
|
#endif
|
|
#ifdef CONFIG_DT_XLP_GVP
|
|
case PRID_IMP_NETLOGIC_XLP9XX:
|
|
fdtp = __dtb_xlp_gvp_begin;
|
|
break;
|
|
#endif
|
|
#ifdef CONFIG_DT_XLP_FVP
|
|
case PRID_IMP_NETLOGIC_XLP2XX:
|
|
fdtp = __dtb_xlp_fvp_begin;
|
|
break;
|
|
#endif
|
|
#ifdef CONFIG_DT_XLP_SVP
|
|
case PRID_IMP_NETLOGIC_XLP3XX:
|
|
fdtp = __dtb_xlp_svp_begin;
|
|
break;
|
|
#endif
|
|
#ifdef CONFIG_DT_XLP_EVP
|
|
case PRID_IMP_NETLOGIC_XLP8XX:
|
|
fdtp = __dtb_xlp_evp_begin;
|
|
break;
|
|
#endif
|
|
default:
|
|
/* Pick a built-in if any, and hope for the best */
|
|
fdtp = __dtb_start;
|
|
break;
|
|
}
|
|
}
|
|
xlp_fdt_blob = fdtp;
|
|
return fdtp;
|
|
}
|
|
|
|
void __init xlp_early_init_devtree(void)
|
|
{
|
|
__dt_setup_arch(xlp_fdt_blob);
|
|
}
|
|
|
|
void __init device_tree_init(void)
|
|
{
|
|
unflatten_and_copy_device_tree();
|
|
}
|
|
|
|
static struct of_device_id __initdata xlp_ids[] = {
|
|
{ .compatible = "simple-bus", },
|
|
{},
|
|
};
|
|
|
|
int __init xlp8xx_ds_publish_devices(void)
|
|
{
|
|
if (!of_have_populated_dt())
|
|
return 0;
|
|
return of_platform_bus_probe(NULL, xlp_ids, NULL);
|
|
}
|
|
|
|
device_initcall(xlp8xx_ds_publish_devices);
|