diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-30 09:16:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-07 16:22:30 -0400 |
| commit | 9774462e34faaa64a91eb9c68b438a52d22bba6a (patch) | |
| tree | d084abcb2ab9208ef5eeccf96dd855bff731f39c | |
| parent | b9d66a061b93e4679bd3afddb24413d5a51dabcc (diff) | |
| download | u-boot-9774462e34faaa64a91eb9c68b438a52d22bba6a.tar.gz u-boot-9774462e34faaa64a91eb9c68b438a52d22bba6a.tar.bz2 u-boot-9774462e34faaa64a91eb9c68b438a52d22bba6a.zip | |
arm: Disable ATAGs support
With the exceptions of ds109, ds414, icnova-a20-swac, nokia_rx51 and
stemmy, disable ATAG support. A large number of platforms had enabled
support but never supported a kernel so old as to require it. Further,
some platforms are old enough to support both, but are well supported by
devicetree booting, and have been for a number of years. This is
because some of the ATAGs related functions have been re-used to provide
the same kind of information, but for devicetree or just generally to
inform the user. When needed still, rename these functions to
get_board_revision() instead, to avoid conflicts. In other cases, these
functions were simply unused, so drop them.
Cc: Andre Przywara <andre.przywara@arm.com>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Phil Sutter <phil@nwl.cc>
Cc: Stefan Bosch <stefan_b@posteo.net>
Signed-off-by: Tom Rini <trini@konsulko.com>
151 files changed, 116 insertions, 563 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d49f26fed4..dbf5ceb9d2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1907,6 +1907,36 @@ config TARGET_XENGUEST_ARM64 select SSCANF endchoice +config SUPPORT_PASSING_ATAGS + bool "Support pre-devicetree ATAG-based booting" + depends on !ARM64 + imply SETUP_MEMORY_TAGS + help + Support for booting older Linux kernels, using ATAGs rather than + passing a devicetree. This is option is rarely used, and the + semantics are defined at + https://www.kernel.org/doc/Documentation/arm/Booting at section 4a. + +config SETUP_MEMORY_TAGS + bool "Pass memory size information via ATAG" + depends on SUPPORT_PASSING_ATAGS + +config CMDLINE_TAG + bool "Pass Linux kernel cmdline via ATAG" + depends on SUPPORT_PASSING_ATAGS + +config INITRD_TAG + bool "Pass initrd starting point and size via ATAG" + depends on SUPPORT_PASSING_ATAGS + +config REVISION_TAG + bool "Pass system revision via ATAG" + depends on SUPPORT_PASSING_ATAGS + +config SERIAL_TAG + bool "Pass system serial number via ATAG" + depends on SUPPORT_PASSING_ATAGS + config ARCH_SUPPORT_TFABOOT bool diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c index 12c5ac331f..ecd70ecbdc 100644 --- a/board/CarMediaLab/flea3/flea3.c +++ b/board/CarMediaLab/flea3/flea3.c @@ -196,12 +196,14 @@ int board_init(void) return 0; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { int rev = 0; return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8; } +#endif /* * called prior to booting kernel or by 'fdt boardsetup' command diff --git a/board/Synology/common/Makefile b/board/Synology/common/Makefile index 62354cc2e8..f688b54906 100644 --- a/board/Synology/common/Makefile +++ b/board/Synology/common/Makefile @@ -2,4 +2,4 @@ # # Copyright (C) 2021 Phil Sutter <phil@nwl.cc> -obj-y += legacy.o +obj-$(SUPPORT_PASSING_ATAGS) += legacy.o diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c index a3657db826..e7b131836b 100644 --- a/board/beckhoff/mx53cx9020/mx53cx9020.c +++ b/board/beckhoff/mx53cx9020/mx53cx9020.c @@ -48,6 +48,7 @@ static const u32 CCAT_MODE_RUN = 0x0033DC8F; DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE; @@ -59,6 +60,7 @@ u32 get_board_rev(void) return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8; } +#endif /* * Set CCAT mode diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 076ac94144..276e59b3bd 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -38,11 +38,6 @@ int board_init(void) return 0; } -u32 get_board_rev(void) -{ - return 0; -} - void reset_cpu(void) { } diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index f29b08247e..c54bffdae4 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -720,10 +720,12 @@ int dram_init(void) return 0; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS); } +#endif static struct mxc_serial_plat cm_fx6_mxc_serial_plat = { .reg = (struct mxc_uart *)UART4_BASE, diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index f6ce3367f8..2436aab71c 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -232,6 +232,7 @@ const int lpsc_size = ARRAY_SIZE(lpsc); #define REV_AM18X_EVM 0x100 +#ifdef CONFIG_REVISION_TAG /* * get_board_rev() - setup to pass kernel board revision information * Returns: @@ -259,6 +260,7 @@ u32 get_board_rev(void) rev = 1; return rev; } +#endif int board_early_init_f(void) { diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 43d9b69ae6..cd021cc8e5 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -143,20 +143,6 @@ const int lpsc_size = ARRAY_SIZE(lpsc); #define CONFIG_DA850_EVM_MAX_CPU_CLK 456000000 #endif -/* - * get_board_rev() - setup to pass kernel board revision information - * Returns: - * bit[0-3] Maximum cpu clock rate supported by onboard SoC - * 0000b - 300 MHz - * 0001b - 372 MHz - * 0010b - 408 MHz - * 0011b - 456 MHz - */ -u32 get_board_rev(void) -{ - return 0; -} - int board_early_init_f(void) { /* diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c index 479e66bddc..54a733b12c 100644 --- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c +++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c @@ -71,11 +71,6 @@ u32 spl_boot_device(void) } #endif -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c index eb492390db..6132916578 100644 --- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c +++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c @@ -71,11 +71,6 @@ u32 spl_boot_device(void) } #endif -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index c8439a6347..46095acedf 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -35,6 +35,7 @@ int dram_init(void) return 0; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { u32 rev = get_cpu_rev(); @@ -42,6 +43,7 @@ u32 get_board_rev(void) rev |= BOARD_REV_2_0 << BOARD_VER_OFFSET; return rev; } +#endif #define UART_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH) diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index 0888630569..a9800ed769 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -32,6 +32,7 @@ DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE; @@ -46,6 +47,7 @@ u32 get_board_rev(void) return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8; } +#endif #define UART_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_DSE_HIGH | \ PAD_CTL_PUS_100K_UP | PAD_CTL_ODE) diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index e92ef26d0a..9155dcfbd0 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -321,12 +321,14 @@ static void setup_gpmi_nand(void) } #endif +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { int rev = nxp_board_rev(); return (get_cpu_rev() & ~(0xF << 8)) | rev; } +#endif static int ar8031_phy_fixup(struct phy_device *phydev) { diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c index c0fe2d546f..70e4dfcfa4 100644 --- a/board/friendlyarm/nanopi2/board.c +++ b/board/friendlyarm/nanopi2/board.c @@ -295,12 +295,12 @@ static void set_ether_addr(void) env_set("ethaddr", ethaddr); } -#ifdef CONFIG_REVISION_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG static void set_board_rev(void) { char info[64] = {0, }; - snprintf(info, ARRAY_SIZE(info), "%02x", get_board_rev()); + snprintf(info, ARRAY_SIZE(info), "%02x", get_board_revision()); env_set("board_rev", info); } #endif @@ -310,7 +310,7 @@ static void set_dtb_name(void) char info[64] = {0, }; snprintf(info, ARRAY_SIZE(info), - "s5p4418-nanopi2-rev%02x.dtb", get_board_rev()); + "s5p4418-nanopi2-rev%02x.dtb", get_board_revision()); env_set("dtb_name", info); } @@ -436,7 +436,7 @@ int board_late_init(void) { bd_update_env(); -#ifdef CONFIG_REVISION_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG set_board_rev(); #endif set_dtb_name(); diff --git a/board/friendlyarm/nanopi2/hwrev.c b/board/friendlyarm/nanopi2/hwrev.c index b1e23a48a8..585e08c944 100644 --- a/board/friendlyarm/nanopi2/hwrev.c +++ b/board/friendlyarm/nanopi2/hwrev.c @@ -80,11 +80,18 @@ void bd_base_rev_init(void) } /* To override __weak symbols */ -u32 get_board_rev(void) +u32 get_board_revision(void) { return (base_rev << 8) | pcb_rev; } +#ifdef CONFIG_REVISION_TAG +u32 get_board_rev(void) +{ + return get_board_revision(); +} +#endif + const char *get_board_name(void) { bd_hwrev_init(); diff --git a/board/friendlyarm/nanopi2/hwrev.h b/board/friendlyarm/nanopi2/hwrev.h index 1b1a828afb..403303131e 100644 --- a/board/friendlyarm/nanopi2/hwrev.h +++ b/board/friendlyarm/nanopi2/hwrev.h @@ -9,7 +9,7 @@ extern void bd_hwrev_init(void); extern void bd_base_rev_init(void); -extern u32 get_board_rev(void); +extern u32 get_board_revision(void); extern const char *get_board_name(void); #endif /* __BD_HW_REV_H__ */ diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c index 6174125e72..9c48883648 100644 --- a/board/ge/mx53ppd/mx53ppd.c +++ b/board/ge/mx53ppd/mx53ppd.c @@ -81,10 +81,12 @@ int dram_init_banksize(void) return 0; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { return get_cpu_rev() & ~(0xF << 8); } +#endif #ifdef CONFIG_USB_EHCI_MX5 int board_ehci_hcd_init(int port) diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c index 086d0522c7..7dbb3a9143 100644 --- a/board/inversepath/usbarmory/usbarmory.c +++ b/board/inversepath/usbarmory/usbarmory.c @@ -27,6 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE; @@ -38,6 +39,7 @@ u32 get_board_rev(void) return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8; } +#endif struct fsl_esdhc_cfg esdhc_cfg[1] = { {MMC_SDHC1_BASE_ADDR} diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c index a70166a542..86032d7fcd 100644 --- a/board/lg/sniper/sniper.c +++ b/board/lg/sniper/sniper.c @@ -156,11 +156,13 @@ int misc_init_r(void) return 0; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { /* Sold devices are expected to be at least revision F. */ return 6; } +#endif void get_board_serial(struct tag_serialnr *serialnr) { diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index fd3cec8358..99ca36fbbe 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -241,6 +241,7 @@ int board_init(void) return 0; } +#ifdef CONFIG_REVISION_TAG /* * Routine: get_board_revision * Description: Return board revision. @@ -249,6 +250,7 @@ u32 get_board_rev(void) { return simple_strtol(hw_build_ptr, NULL, 16); } +#endif /* * Routine: setup_board_tags diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index df52a4689f..74697ba2f1 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -419,7 +419,7 @@ int misc_init_r(void) return 0; } -static void get_board_rev(void) +static void get_board_revision(void) { ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_board_rev, msg, 1); int ret; @@ -478,7 +478,7 @@ int board_init(void) hw_watchdog_init(); #endif - get_board_rev(); + get_board_revision(); gd->bd->bi_boot_params = 0x100; diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c index e2d5a7c9ba..554fc91cc1 100644 --- a/board/samsung/common/exynos5-dt-types.c +++ b/board/samsung/common/exynos5-dt-types.c @@ -47,18 +47,6 @@ struct odroid_rev_info odroid_info[] = { { EXYNOS5_BOARD_ODROID_UNKNOWN, 0, 4095, "unknown" }, }; -static unsigned int odroid_get_rev(void) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(odroid_info); i++) { - if (odroid_info[i].board_type == gd->board_type) - return odroid_info[i].board_rev; - } - - return 0; -} - /* * Read ADC at least twice and check the resuls. If regulator providing voltage * on to measured point was just turned on, first reads might require time @@ -200,6 +188,19 @@ bool board_is_generic(void) return false; } +#ifdef CONFIG_REVISION_TAG +static unsigned int odroid_get_rev(void) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(odroid_info); i++) { + if (odroid_info[i].board_type == gd->board_type) + return odroid_info[i].board_rev; + } + + return 0; +} + /** * get_board_rev() - return detected board revision. * @@ -212,6 +213,7 @@ u32 get_board_rev(void) return odroid_get_rev(); } +#endif /** * get_board_type() - returns board type string. diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index b32b82fc2d..ba25ba27b8 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -24,11 +24,6 @@ DECLARE_GLOBAL_DATA_PTR; -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { /* Set Initial global variables */ diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c index e17454ad77..7a91f44896 100644 --- a/board/samsung/origen/origen.c +++ b/board/samsung/origen/origen.c @@ -12,11 +12,6 @@ #include <asm/arch/pinmux.h> #include <usb.h> -u32 get_board_rev(void) -{ - return 0; -} - int exynos_init(void) { return 0; diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index 59e6fbf4b0..a03dc87385 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -67,10 +67,12 @@ static void check_hw_revision(void) board_rev = modelrev << 8; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { return board_rev; } +#endif static inline u32 get_model_rev(void) { diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 9ef11b8471..3764b5478b 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -33,10 +33,12 @@ DECLARE_GLOBAL_DATA_PTR; unsigned int board_rev; static int init_pmic_lcd(void); +#ifdef CONFIG_REVISION_TAG u32 get_board_rev(void) { return board_rev; } +#endif int exynos_power_init(void) { diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c index 46fcf907fc..34f9d6bc00 100644 --- a/board/st/stm32f429-discovery/stm32f429-discovery.c +++ b/board/st/stm32f429-discovery/stm32f429-discovery.c @@ -46,11 +46,6 @@ int dram_init_banksize(void) return 0; } -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c index 3b6df1f3ab..c170314ed8 100644 --- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c +++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c @@ -40,11 +40,6 @@ int dram_init_banksize(void) return 0; } -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c index c5df9b0d9c..122273a2ae 100644 --- a/board/st/stm32f469-discovery/stm32f469-discovery.c +++ b/board/st/stm32f469-discovery/stm32f469-discovery.c @@ -40,11 +40,6 @@ int dram_init_banksize(void) return 0; } -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index efa38a0e26..376bc06a98 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -77,12 +77,7 @@ u32 spl_boot_device(void) { return BOOT_DEVICE_XIP; } - #endif -u32 get_board_rev(void) -{ - return 0; -} int board_late_init(void) { diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c index 4091d5f9fd..cc87230026 100644 --- a/board/st/stm32h743-disco/stm32h743-disco.c +++ b/board/st/stm32h743-disco/stm32h743-disco.c @@ -36,11 +36,6 @@ int dram_init_banksize(void) return 0; } -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c index 4091d5f9fd..cc87230026 100644 --- a/board/st/stm32h743-eval/stm32h743-eval.c +++ b/board/st/stm32h743-eval/stm32h743-eval.c @@ -36,11 +36,6 @@ int dram_init_banksize(void) return 0; } -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; diff --git a/board/st/stm32h750-art-pi/stm32h750-art-pi.c b/board/st/stm32h750-art-pi/stm32h750-art-pi.c index 5785b2e575..0ece8e79f2 100644 --- a/board/st/stm32h750-art-pi/stm32h750-art-pi.c +++ b/board/st/stm32h750-art-pi/stm32h750-art-pi.c @@ -41,11 +41,6 @@ int board_early_init_f(void) return 0; } -u32 get_board_rev(void) -{ - return 0; -} - int board_late_init(void) { return 0; diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index fda8d5f3c8..d8062997e5 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -312,6 +312,7 @@ void board_mmc_power_init(void) #endif #endif +#ifdef CONFIG_REVISION_TAG /* * get_board_rev() - get board revision */ @@ -319,3 +320,4 @@ u32 get_board_rev(void) { return 0x20; } +#endif diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 4895bfafd8..69726eb9ce 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -104,6 +104,7 @@ int spl_start_uboot(void) } #endif /* CONFIG_SPL_OS_BOOT */ +#ifdef CONFIG_REVISION_TAG /* * get_board_rev() - get board revision */ @@ -111,3 +112,4 @@ u32 get_board_rev(void) { return 0x20; } +#endif diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 74060daadd..f4cd28d49f 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -707,12 +707,11 @@ int board_init(void) #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) { -#if defined(CONFIG_REVISION_TAG) && \ - defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG) +#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG) char env_str[256]; u32 rev; - rev = get_board_rev(); + rev = get_board_revision(); snprintf(env_str, ARRAY_SIZE(env_str), "%.4x", rev); env_set("board_rev", env_str); diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 587d92a8e9..3b55f6c938 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -611,12 +611,11 @@ int board_init(void) #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) { -#if defined(CONFIG_REVISION_TAG) && \ - defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG) +#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG) char env_str[256]; u32 rev; - rev = get_board_rev(); + rev = get_board_revision(); snprintf(env_str, ARRAY_SIZE(env_str), "%.4x", rev); env_set("board_rev", env_str); #endif diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index 061abf7537..9db4553e0f 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -32,8 +32,8 @@ static char tdx_car_rev_str[6]; static char *tdx_carrier_board_name; #endif -#ifdef CONFIG_REVISION_TAG -u32 get_board_rev(void) +#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG) +u32 get_board_revision(void) { /* Check validity */ if (!tdx_hw_tag.ver_major) @@ -183,8 +183,8 @@ int ft_common_board_setup(void *blob, struct bd_info *bd) #else /* CONFIG_TDX_CFG_BLOCK */ -#ifdef CONFIG_REVISION_TAG -u32 get_board_rev(void) +#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG) +u32 get_board_revision(void) { return 0; } diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h index 8020df5b44..c96e8754e9 100644 --- a/board/toradex/common/tdx-common.h +++ b/board/toradex/common/tdx-common.h @@ -10,6 +10,7 @@ #define TDX_USB_VID 0x1B67 int ft_common_board_setup(void *blob, struct bd_info *bd); +u32 get_board_revision(void); #if defined(CONFIG_DM_VIDEO) int show_boot_logo(void); diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index 135c149c31..e06b7fdf1a 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -3,6 +3,9 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y +CONFIG_SUPPORT_PASSING_ATAGS=y +CONFIG_CMDLINE_TAG=y +CONFIG_INITRD_TAG=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_DS109=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index 3c0960513d..de5d85cbda 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -1,6 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y +CONFIG_SUPPORT_PASSING_ATAGS=y +CONFIG_CMDLINE_TAG=y +CONFIG_INITRD_TAG=y CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig index de455608a3..c759d7e235 100644 --- a/configs/icnova-a20-swac_defconfig +++ b/configs/icnova-a20-swac_defconfig @@ -1,5 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y +CONFIG_SUPPORT_PASSING_ATAGS=y +CONFIG_CMDLINE_TAG=y +CONFIG_INITRD_TAG=y +CONFIG_SERIAL_TAG=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac" CONFIG_SPL=y CONFIG_MACH_SUN7I=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 82d3371041..e6e8f2af51 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -2,6 +2,10 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SUPPORT_PASSING_ATAGS=y +CONFIG_CMDLINE_TAG=y +CONFIG_INITRD_TAG=y +CONFIG_REVISION_TAG=y CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SYS_MALLOC_LEN=0xc0000 diff --git a/configs/stemmy_defconfig b/configs/stemmy_defconfig index 77bc5c71dd..cf86146696 100644 --- a/configs/stemmy_defconfig +++ b/configs/stemmy_defconfig @@ -1,6 +1,9 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_U8500=y +CONFIG_SUPPORT_PASSING_ATAGS=y +# CONFIG_SETUP_MEMORY_TAGS is not set +CONFIG_INITRD_TAG=y CONFIG_SYS_TEXT_BASE=0x100000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SYS_MALLOC_LEN=0x0200000 diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index e7c099511d..fc6167cf96 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -37,15 +37,6 @@ * for your console driver. */ -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */ - #define MTDPARTS_DEFAULT "mtdparts=spi0.0:768K(boot)ro,256K(boot-env),14M(user),1M(errlog)" #define MTDPARTS_MTDOOPS "errlog" #define CONFIG_DOS_PARTITION @@ -60,11 +51,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for monitor */ -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Mem map for Linux*/ /* size in bytes reserved for initial data */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 3e42ef98a7..06be63e242 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -37,15 +37,6 @@ * for your console driver. */ -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */ - #define MTDPARTS_DEFAULT "mtdparts=spi0.0:768K(boot)ro,256K(boot-env),14M(user),1M(errlog)" #define MTDPARTS_MTDOOPS "errlog" #define CONFIG_DOS_PARTITION diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index a9c14a1ce2..edfd890767 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -14,8 +14,6 @@ #include <configs/ti_omap3_common.h> -#define CONFIG_REVISION_TAG - /* Hardware drivers */ /* diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index de6e205e39..710b81209a 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -23,11 +23,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index 2c7790eb06..5177bf20fa 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -13,9 +13,6 @@ #include <asm/arch/platform.h> /* Misc CPU related */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SYS_SDRAM_BASE ASPEED_DRAM_BASE diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index e7fc15f48f..d07262c25a 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -35,9 +35,6 @@ #endif /* Misc CPU related */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 7b9fa8af80..fb4695c1ab 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -22,10 +22,6 @@ #include <asm/hardware.h> -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #define CONFIG_ATMEL_LEGACY /* diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 9ad41e4ced..f8df5b0eb7 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -22,10 +22,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 16367660 /* 16.367 MHz crystal */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - #ifndef CONFIG_SYS_USE_BOOT_NORFLASH #else #define CONFIG_SYS_USE_NORFLASH diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index c942e7d9e6..78ff577767 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -18,10 +18,6 @@ #define CONFIG_AT91SAM9M10G45EK -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 683fc73d3b..4ae6b66a3b 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -14,9 +14,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 16000000 /* main clock xtal */ /* Misc CPU related */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /* LCD */ #define LCD_BPP LCD_COLOR16 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index cdcfb22955..c703276bcb 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -16,10 +16,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* main clock xtal */ -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - #define CONFIG_ATMEL_LEGACY /* diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 5b7634e800..33481dc045 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -12,10 +12,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index e4c6b7fcfc..7f1c298cdc 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -119,7 +119,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Informational display configuration. */ -#define CONFIG_REVISION_TAG /* * Command configuration. diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 921f30612e..84ea032e2f 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -60,9 +60,6 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index e58026e783..c97a05ed69 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -24,10 +24,6 @@ #define CONFIG_POWER_TPS65217 -/* Support both device trees and ATAGs. */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /*#define CONFIG_MACH_TYPE 3589*/ #define CONFIG_MACH_TYPE 0xFFFFFFFF /* TODO: check with kernel*/ diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index e892b6fd40..1b11a5da6c 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -24,9 +24,6 @@ #define CONFIG_FSL_USDHC /* Boot */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_MACH_TYPE 0xFFFFFFFF /* misc */ diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index 404f52d900..714d37ea4b 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -60,11 +60,6 @@ BUR_COMMON_ENV \ " bootm ${loadaddr} - ${dtbaddr}\0" #endif /* !CONFIG_SPL_BUILD*/ -/* Support both device trees and ATAGs. */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* SPI Flash */ /* Environment */ diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index cffd9a897d..9f7fcda291 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -57,11 +57,6 @@ BUR_COMMON_ENV \ #define CONFIG_BOOTCOMMAND "mmc dev 1; run b_default" -/* Support both device trees and ATAGs. */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* Environment */ #endif /* __CONFIG_BRXRE1_H__ */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 8d628e7a60..44135b2f21 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -21,11 +21,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 0a91784ccf..08786765d5 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -28,8 +28,6 @@ "fi; " \ "bootm 0xc0000;" #define CONFIG_TIMESTAMP -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS /* * Serial Console Configuration diff --git a/include/configs/corvus.h b/include/configs/corvus.h index cb9ef6769a..32f4a10cf5 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -29,10 +29,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ef2b4f4692..34683f60c7 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -177,9 +177,6 @@ */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_HWCONFIG /* enable hwconfig */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTCOMMAND \ "run envboot; " \ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index f32e18b762..40b346b583 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -109,12 +109,6 @@ * U-Boot Commands */ -/* - * Boot Linux - */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS - #define CONFIG_BOOTFILE "uImage" /* diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 9c59fd8254..7c2ec432fc 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -34,8 +34,6 @@ #include <configs/ti_omap3_common.h> -#define CONFIG_REVISION_TAG 1 - /* Hardware drivers */ /* DM9000 */ #define CONFIG_NET_RETRY_COUNT 20 diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index e31f726ca4..7af8fceb71 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -27,11 +27,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Bootcounter */ #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/display5.h b/include/configs/display5.h index 82ef8b00b4..27854dfdf1 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -47,11 +47,6 @@ #include "imx6_spl.h" -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_MXC_UART_BASE UART5_BASE /* I2C Configs */ diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index ca9fd13303..fbe468010b 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -94,15 +94,6 @@ /* auto boot */ -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */ - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ /* diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 8f8b4722c7..9a1505846d 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -122,9 +122,6 @@ /* File systems */ /* Boot command */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_BOOTCOMMAND "sf probe 0:0; " \ "sf read 0x22000000 0xc6000 0x294000; " \ "bootm 0x22000000" diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 9c778da7e0..95aaa747e4 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -22,10 +22,6 @@ #define CONFIG_SYS_CLK_FREQ 24000000 #define COUNTER_FREQUENCY CONFIG_SYS_CLK_FREQ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG - /* select serial console configuration */ /* PWM */ diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 2ca14d0b86..52dcf7a3bc 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -14,8 +14,6 @@ #define CONFIG_BOARD_COMMON -#define CONFIG_REVISION_TAG - /* SD/MMC configuration */ #define CONFIG_MMC_DEFAULT_DEV 0 diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 7d877c1fd9..daf90bde55 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -23,11 +23,6 @@ /* This is required to setup the ESDC controller */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* * Hardware drivers */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index ef672a27b7..0eeffd4637 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -19,11 +19,6 @@ #include "mx6_common.h" #include <linux/sizes.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* SATA Configs */ #ifdef CONFIG_CMD_SATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 52b4b356ac..29a446c2f5 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -13,7 +13,6 @@ /* Miscellaneous */ #define CONFIG_SYS_PBSIZE 256 -#define CONFIG_CMDLINE_TAG /* Internal RAM Size (RZ/A1=3M, RZ/A1M=5M, RZ/A1H=10M) */ #define CONFIG_SYS_SDRAM_BASE 0x20000000 diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 5078d0cc43..27aab38926 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -15,10 +15,6 @@ #define CONFIG_MX27 #define CONFIG_MX27_CLK32 32768 /* OSC32K frequency */ -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - /* * Lowlevel configuration */ diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index cf98834126..b573bdc64f 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -8,9 +8,6 @@ #define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS - /* * There are various dependencies on the core module (CM) fitted * Users should refer to their CM user guide diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 19543bc2b6..29fcce94eb 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -55,15 +55,6 @@ "" /* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ - -/* * NAND Flash configuration */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index bbdd53ea8d..8471dffe83 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -16,10 +16,6 @@ #include "imx6_spl.h" /* common IMX6 SPL configuration */ /* Miscellaneous configurable options */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG /* FEC ethernet */ #define CONFIG_ARP_TIMEOUT 200UL diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 8fe3cad77a..094a9f960c 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -12,10 +12,6 @@ #include <asm/arch/rmobile.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* MEMORY */ #define KZM_SDRAM_BASE (0x40000000) #define PHYS_SDRAM KZM_SDRAM_BASE diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 9565f7c222..6928179201 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -60,8 +60,6 @@ */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_HWCONFIG /* enable hwconfig */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_INITRD_TAG #define CONFIG_BOOTCOMMAND \ "if mmc rescan; then " \ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index d926449a54..7a7640a49c 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -147,8 +147,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMDLINE_TAG - #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 2f03a9d314..a164796dd8 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -387,8 +387,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMDLINE_TAG - #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 6d225d9499..067d4f725d 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -233,8 +233,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMDLINE_TAG - #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index e7a2bcb7db..4ef4cacd97 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -365,8 +365,6 @@ unsigned long get_board_sys_clk(void); * Environment */ -#define CONFIG_CMDLINE_TAG - #include <asm/fsl_secure_boot.h> #endif /* __LS1043AQDS_H__ */ diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 6f96b9cae5..b6bbc01304 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -377,8 +377,6 @@ unsigned long get_board_sys_clk(void); * Environment */ -#define CONFIG_CMDLINE_TAG - #undef CONFIG_BOOTCOMMAND #ifdef CONFIG_TFABOOT #define IFC_NAND_BOOTCOMMAND "run distro_bootcmd; run nand_bootcmd; " \ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 34c8da2fcf..813d326cda 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -11,7 +11,6 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_REVISION_TAG #define CONFIG_SYS_FSL_CLK #define CONFIG_TIMESTAMP /* Print image info with timestamp */ @@ -130,10 +129,6 @@ /* * Boot Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTFILE "boot/fitImage" #define CONFIG_BOOTCOMMAND "run mmc_mmc" diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 162e02fb44..3457c59885 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -32,11 +32,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */ /* Misc CPU related */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_SERIAL_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ /* * Hardware drivers diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 440776fcb7..6023f8128e 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -12,9 +12,6 @@ #include <linux/sizes.h> /* Miscellaneous configurable options */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_TAG #define CONFIG_SYS_MAXARGS 8 #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index c98d79498d..c58545be04 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -12,9 +12,6 @@ #include <linux/sizes.h> /* Miscellaneous configurable options */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_TAG #define CONFIG_SYS_MAXARGS 8 #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 052d4b9ca5..65d7dd1430 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -41,15 +41,6 @@ /* auto boot */ -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */ - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ /* diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 3380d9efb5..755f59eee9 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -25,15 +25,6 @@ 4000000, 4500000, 5000000, 5500000, \ 6000000 } -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ /* diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index b107855226..beecf1838e 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -19,15 +19,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ /* diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 065e8c7f3b..3e2394092a 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -16,11 +16,6 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_MACH_TYPE MACH_TYPE_MX51_BABBAGE /* * Hardware drivers diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 432e380cca..f03e425297 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -14,14 +14,8 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #define CONFIG_SYS_FSL_CLK -#define CONFIG_REVISION_TAG - #define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_FPGA_COUNT 1 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 50fc9625d0..8595c93692 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -13,14 +13,8 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #define CONFIG_SYS_FSL_CLK -#define CONFIG_REVISION_TAG - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 6dd169a070..b623242256 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -11,14 +11,8 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #define CONFIG_SYS_FSL_CLK -#define CONFIG_REVISION_TAG - /* USB Configs */ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 71ffcc236b..5c0b729ccd 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -33,12 +33,6 @@ #define CONFIG_SYS_FSL_CLK -/* ATAGs */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index f02f3ad04d..48172de1d0 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -32,10 +32,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 /* Fixed at 1MHz from TSTMR */ -#define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS - /* UART */ #define LPUART_BASE LPUART4_RBASE diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index edc26b0e1a..567a037089 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -22,11 +22,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 /* Fixed at 1Mhz from TSTMR */ -#define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -/*#define CONFIG_REVISION_TAG*/ - /* UART */ #define LPUART_BASE LPUART4_RBASE diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 2348accae6..64f017ab77 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -84,10 +84,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -/* Booting Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS - /* * Drivers */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 4ff797baa6..972df00d43 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -34,11 +34,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_CMDLINE_TAG /* enable passing kernel command line string */ -#define CONFIG_INITRD_TAG /* enable passing initrd */ -#define CONFIG_REVISION_TAG /* enable passing revision tag*/ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ - #define CONFIG_UBI_SIZE (512 << 10) /* diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 384885aa5e..30d4783807 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -171,6 +171,4 @@ */ #define CONFIG_MISC_COMMON -#undef CONFIG_REVISION_TAG - #endif /* __CONFIG_H */ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index fc70dc6a73..70481b5d0c 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -75,7 +75,6 @@ /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ #define CONFIG_ODROID_REV_AIN 9 -#define CONFIG_REVISION_TAG /* * Need to override existing one (smdk5420) with odroid so set_board_info will diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 6563335f91..5d300b13f3 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -18,11 +18,6 @@ * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB). */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* NAND */ #if defined(CONFIG_MTD_RAW_NAND) #define CONFIG_SYS_FLASH_BASE NAND_BASE diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index e2e871a9cb..52a22a9758 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -23,11 +23,6 @@ * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB). */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* NAND */ #if defined(CONFIG_MTD_RAW_NAND) #define CONFIG_SYS_FLASH_BASE NAND_BASE diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 8dc30be8b7..0fee2ed921 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -16,8 +16,6 @@ * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB). */ -#define CONFIG_REVISION_TAG 1 - /* TPS65950 */ #define PBIASLITEVMODE1 (1 << 8) diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index ca5229cd2f..886f2e9d86 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -20,11 +20,6 @@ * order to allow for BCH8 to fit in. */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Hardware drivers */ /* I2C */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 66bb00065f..f60d15b9db 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -170,9 +170,6 @@ * Linux Information */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) -#define CONFIG_CMDLINE_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTCOMMAND \ "run envboot; " \ "run mmcboot; " diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 6b9436e2b2..5b2e084a22 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -12,9 +12,6 @@ #include <linux/sizes.h> #include <linux/stringify.h> -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 62a2a8f6aa..3af4135be7 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -128,10 +128,6 @@ AT91_WDT_MR_WDDIS | \ AT91_WDT_MR_WDD(0xfff)) -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - /* * Hardware drivers */ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index d93d23ccfc..18eec71763 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -140,10 +140,6 @@ AT91_WDT_MR_WDDIS | \ AT91_WDT_MR_WDD(0xfff)) -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - #define CONFIG_USER_LOWLEVEL_INIT 1 /* diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 5803ab55d3..c22f698d31 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -19,10 +19,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 6bf1889140..595482c22e 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -10,10 +10,6 @@ #include <asm/arch/rmobile.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #ifdef CONFIG_SPL #define CONFIG_SPL_TARGET "spl/u-boot-spl.srec" #endif diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 7c89fc1561..2b3e1bb0d1 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -21,10 +21,6 @@ /* boot option */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* Generic Interrupt Controller Definitions */ #define GICD_BASE 0xF1010000 #define GICC_BASE 0xF1020000 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 71b91b54e7..14c89a9741 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -85,11 +85,6 @@ /* Shell */ -/* ATAGs support for bootm/bootz */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG - /* Environment */ #define ENV_DEVICE_SETTINGS \ "stdin=serial,usbkbd\0" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 85c6e065d3..b4a3cc0445 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -26,11 +26,6 @@ /* Text Base */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_INITRD_TAG - /* MMC */ #define SDHCI_MAX_HOSTS 4 diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 7d0768fa34..774ecb4193 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -14,10 +14,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 24000000 /* 24 MHz crystal */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID 0 /* ignored in arm */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 79226865ec..5d89ed34cb 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -22,10 +22,6 @@ #define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE #endif -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* commands to include */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 03260c3335..233a26a38f 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -40,9 +40,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* 18.432MHz crystal */ /* misc settings */ -#define CONFIG_CMDLINE_TAG /* pass commandline to Kernel */ -#define CONFIG_SETUP_MEMORY_TAGS /* pass memory defs to kernel */ -#define CONFIG_INITRD_TAG /* pass initrd param to kernel */ /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 84c647957c..a5edf04a43 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -29,10 +29,6 @@ /* Text Base */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG - /* * select serial console configuration */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index dd2a549606..61d5968982 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -12,7 +12,6 @@ #undef CONFIG_BOARD_COMMON #undef CONFIG_USB_GADGET_DWC2_OTG_PHY -#undef CONFIG_REVISION_TAG /* High Level Configuration Options */ #define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index c5d2c1d889..32abeb03fb 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -20,10 +20,6 @@ /* CPU */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE (64 * 1024 * 1024) /* 64MB */ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 9b582782c6..b13584da51 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -19,9 +19,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* CPU */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 267a1b851c..7c563b7b04 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -99,16 +99,6 @@ "bootargs=console=ttyO2,115200 vram=5M,0x9FA00000 omapfb.vram=0:5M\0" /* - * ATAGs - */ - -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SERIAL_TAG - -/* * Boot */ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 73317afc31..0b37efeafa 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -43,7 +43,6 @@ "setenv altbootcmd 'setenv bootnum b && saveenv && boot;' && " \ "saveenv && saveenv && boot;" -#define CONFIG_CMDLINE_TAG #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Environment settings */ diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h index b250a53e60..e5571b240d 100644 --- a/include/configs/stemmy.h +++ b/include/configs/stemmy.h @@ -19,9 +19,6 @@ #define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_PL310_BASE 0xa0412000 -/* Generate initrd atag for downstream kernel (others are copied in stemmy.c) */ -#define CONFIG_INITRD_TAG - /* Linux does not boot if FDT / initrd is loaded to end of RAM */ #define BOOT_ENV \ "fdt_high=0x6000000\0" \ diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 34a408a103..b1917c9d3f 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -43,8 +43,6 @@ /* Extra Commands */ -#define CONFIG_SETUP_MEMORY_TAGS - #define CONFIG_SYS_GBL_DATA_SIZE 1024 /* Global data structures */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN - \ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index f47932df00..525a5277d8 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -25,11 +25,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index 51b2de2f21..609b4c2c3b 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -27,11 +27,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_CBSIZE 1024 #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 0c4ac64c0f..a8f6fbf9cf 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -27,11 +27,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_CBSIZE 1024 #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 15bc43b489..c76d290a57 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -29,11 +29,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_CBSIZE 1024 #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index f5620554d1..c43b0d8285 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -18,11 +18,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_MAXARGS 16 #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index d4f37a34e3..d838449452 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -18,11 +18,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_MAXARGS 16 #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h index f35a0cedab..db17939a8c 100644 --- a/include/configs/stm32h750-art-pi.h +++ b/include/configs/stm32h750-art-pi.h @@ -18,11 +18,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_MAXARGS 16 #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 1ac1cac8d3..4ccaab5b47 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -27,11 +27,6 @@ */ #define CONFIG_SYS_CBSIZE SZ_1K -/* ATAGs */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* * For booting Linux, use the first 256 MB of memory, since this is * the maximum mapped by the Linux kernel during initialization. diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 4461230555..5a967bbed7 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -105,11 +105,6 @@ #define CONFIG_SYS_64BIT_LBA #endif -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -#define CONFIG_SERIAL_TAG - #ifdef CONFIG_NAND_SUNXI #define CONFIG_SYS_NAND_MAX_ECCPOS 1664 #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 5fafee280b..166b8397ad 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -20,11 +20,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* * DDR related */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 2ae167fd42..23f1e378e6 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -33,9 +33,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* main clock xtal */ /* Misc CPU related */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 2bc531c463..f8e741ab6f 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -22,11 +22,6 @@ #define CONFIG_TEGRA_SLINK_CTRLS 6 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* Tag support */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 432eceaf35..673056ce51 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_TIMER_COUNTER NV_PA_TMRUS_BASE #endif -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ - /* Environment */ /* diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 20848a6b19..f12e9f7f6d 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -20,10 +20,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /* for ramdisk support */ - /* commands to include */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index a6b724e889..fa48cd2818 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -16,11 +16,6 @@ #ifndef __CONFIG_TI_ARMV7_COMMON_H__ #define __CONFIG_TI_ARMV7_COMMON_H__ -/* Support both device trees and ATAGs. */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* * We setup defaults based on constraints from the Linux kernel, which should * also be safe elsewhere. We have the default load at 32MB into DDR (for diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 2990b529c0..0bbc984753 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -30,15 +30,6 @@ 4000000, 4500000, 5000000, 5500000, \ 6000000 } -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */ /* diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index c9c72c94ce..61b577e98e 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -22,10 +22,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_USB_A9263 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* * Hardware drivers */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index d7d98cd03f..25088da8ed 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -108,12 +108,8 @@ /* Board info register */ #define SYS_ID V2M_SYSREGS -#define CONFIG_REVISION_TAG 1 -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_SYS_L2CACHE_OFF 1 -#define CONFIG_INITRD_TAG 1 #define SCTL_BASE V2M_SYSCTL #define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0) diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index b005db8278..2330310745 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -15,9 +15,6 @@ #define CONFIG_MACH_TYPE 4146 -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index aa307be06a..23a0bed77d 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -80,9 +80,6 @@ /* * Boot Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 8b4b0bfd18..2991360196 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -26,10 +26,6 @@ "fatls usb 0; fatload usb 0 0x81000000 zmx25-init.bin;" \ "bootm 0x81000000; bootelf 0x81000000\0" -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* * Hardware drivers */ |