aboutsummaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini2021-08-30 09:16:30 -0400
committerTom Rini2021-09-07 16:22:30 -0400
commit9774462e34faaa64a91eb9c68b438a52d22bba6a (patch)
treed084abcb2ab9208ef5eeccf96dd855bff731f39c /include/configs
parentb9d66a061b93e4679bd3afddb24413d5a51dabcc (diff)
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>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/SBx81LIFKW.h14
-rw-r--r--include/configs/SBx81LIFXCAT.h9
-rw-r--r--include/configs/am3517_evm.h2
-rw-r--r--include/configs/apalis_imx6.h5
-rw-r--r--include/configs/aspeed-common.h3
-rw-r--r--include/configs/at91sam9260ek.h3
-rw-r--r--include/configs/at91sam9261ek.h4
-rw-r--r--include/configs/at91sam9263ek.h4
-rw-r--r--include/configs/at91sam9m10g45ek.h4
-rw-r--r--include/configs/at91sam9n12ek.h3
-rw-r--r--include/configs/at91sam9rlek.h4
-rw-r--r--include/configs/at91sam9x5ek.h4
-rw-r--r--include/configs/bcmstb.h1
-rw-r--r--include/configs/bk4r1.h3
-rw-r--r--include/configs/brppt1.h4
-rw-r--r--include/configs/brppt2.h3
-rw-r--r--include/configs/brsmarc1.h5
-rw-r--r--include/configs/brxre1.h5
-rw-r--r--include/configs/colibri_imx6.h5
-rw-r--r--include/configs/colibri_pxa270.h2
-rw-r--r--include/configs/corvus.h4
-rw-r--r--include/configs/da850evm.h3
-rw-r--r--include/configs/devkit3250.h6
-rw-r--r--include/configs/devkit8000.h2
-rw-r--r--include/configs/dh_imx6.h5
-rw-r--r--include/configs/display5.h5
-rw-r--r--include/configs/edminiv2.h9
-rw-r--r--include/configs/ethernut5.h3
-rw-r--r--include/configs/exynos-common.h4
-rw-r--r--include/configs/exynos4-common.h2
-rw-r--r--include/configs/flea3.h5
-rw-r--r--include/configs/ge_bx50v3.h5
-rw-r--r--include/configs/grpeach.h1
-rw-r--r--include/configs/imx27lite-common.h4
-rw-r--r--include/configs/integrator-common.h3
-rw-r--r--include/configs/km/km_arm.h9
-rw-r--r--include/configs/kp_imx6q_tpc.h4
-rw-r--r--include/configs/kzm9g.h4
-rw-r--r--include/configs/legoev3.h2
-rw-r--r--include/configs/ls1021aiot.h2
-rw-r--r--include/configs/ls1021aqds.h2
-rw-r--r--include/configs/ls1021atwr.h2
-rw-r--r--include/configs/ls1043aqds.h2
-rw-r--r--include/configs/ls1046aqds.h2
-rw-r--r--include/configs/m53menlo.h5
-rw-r--r--include/configs/meesc.h5
-rw-r--r--include/configs/mt7623.h3
-rw-r--r--include/configs/mt7629.h3
-rw-r--r--include/configs/mv-common.h9
-rw-r--r--include/configs/mvebu_armada-37xx.h9
-rw-r--r--include/configs/mvebu_armada-8k.h9
-rw-r--r--include/configs/mx51evk.h5
-rw-r--r--include/configs/mx53cx9020.h6
-rw-r--r--include/configs/mx53loco.h6
-rw-r--r--include/configs/mx53ppd.h6
-rw-r--r--include/configs/mx6_common.h6
-rw-r--r--include/configs/mx7ulp_com.h4
-rw-r--r--include/configs/mx7ulp_evk.h5
-rw-r--r--include/configs/mxs.h4
-rw-r--r--include/configs/nokia_rx51.h5
-rw-r--r--include/configs/odroid.h2
-rw-r--r--include/configs/odroid_xu3.h1
-rw-r--r--include/configs/omap3_beagle.h5
-rw-r--r--include/configs/omap3_evm.h5
-rw-r--r--include/configs/omap3_igep00x0.h2
-rw-r--r--include/configs/omap3_logic.h5
-rw-r--r--include/configs/omapl138_lcdk.h3
-rw-r--r--include/configs/pcm052.h3
-rw-r--r--include/configs/pm9261.h4
-rw-r--r--include/configs/pm9263.h4
-rw-r--r--include/configs/pm9g45.h4
-rw-r--r--include/configs/rcar-gen2-common.h4
-rw-r--r--include/configs/rcar-gen3-common.h4
-rw-r--r--include/configs/rpi.h5
-rw-r--r--include/configs/s5p_goni.h5
-rw-r--r--include/configs/sam9x60ek.h4
-rw-r--r--include/configs/siemens-am33x-common.h4
-rw-r--r--include/configs/smartweb.h3
-rw-r--r--include/configs/smdkc100.h4
-rw-r--r--include/configs/smdkv310.h1
-rw-r--r--include/configs/snapper9260.h4
-rw-r--r--include/configs/snapper9g45.h3
-rw-r--r--include/configs/sniper.h10
-rw-r--r--include/configs/socfpga_arria5_secu1.h1
-rw-r--r--include/configs/stemmy.h3
-rw-r--r--include/configs/stih410-b2260.h2
-rw-r--r--include/configs/stm32f429-discovery.h5
-rw-r--r--include/configs/stm32f429-evaluation.h5
-rw-r--r--include/configs/stm32f469-discovery.h5
-rw-r--r--include/configs/stm32f746-disco.h5
-rw-r--r--include/configs/stm32h743-disco.h5
-rw-r--r--include/configs/stm32h743-eval.h5
-rw-r--r--include/configs/stm32h750-art-pi.h5
-rw-r--r--include/configs/stm32mp1.h5
-rw-r--r--include/configs/sunxi-common.h5
-rw-r--r--include/configs/tam3517-common.h5
-rw-r--r--include/configs/taurus.h3
-rw-r--r--include/configs/tec-ng.h5
-rw-r--r--include/configs/tegra-common.h2
-rw-r--r--include/configs/ti814x_evm.h4
-rw-r--r--include/configs/ti_armv7_common.h5
-rw-r--r--include/configs/turris_mox.h9
-rw-r--r--include/configs/usb_a9263.h4
-rw-r--r--include/configs/vexpress_common.h4
-rw-r--r--include/configs/vf610twr.h3
-rw-r--r--include/configs/work_92105.h3
-rw-r--r--include/configs/zmx25.h4
107 files changed, 0 insertions, 458 deletions
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index e7c099511d3..fc6167cf969 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 3e42ef98a71..06be63e2421 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 a9c14a1ce28..edfd890767d 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 de6e205e397..710b81209aa 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 2c7790eb06c..5177bf20fad 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 e7fc15f48fc..d07262c25ab 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 7b9fa8af80a..fb4695c1abf 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 9ad41e4ced3..f8df5b0eb7e 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 c942e7d9e69..78ff5777670 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 683fc73d3b2..4ae6b66a3b2 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 cdcfb22955a..c703276bcbc 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 5b7634e8000..33481dc0459 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 e4c6b7fcfc9..7f1c298cdce 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 921f30612e6..84ea032e2fb 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 e58026e783b..c97a05ed697 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 e892b6fd404..1b11a5da6c8 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 404f52d900e..714d37ea4bf 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 cffd9a897d0..9f7fcda2918 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 8d628e7a60a..44135b2f214 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 0a91784ccf9..08786765d5a 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 cb9ef6769a5..32f4a10cf56 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 ef2b4f4692c..34683f60c7a 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 f32e18b7625..40b346b583c 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 9c59fd82543..7c2ec432fc8 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 e31f726ca40..7af8fceb71a 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 82ef8b00b41..27854dfdf1e 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 ca9fd133035..fbe468010bf 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 8f8b4722c77..9a1505846da 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 9c778da7e08..95aaa747e4b 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 2ca14d0b86e..52dcf7a3bc4 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 7d877c1fd99..daf90bde552 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 ef672a27b7d..0eeffd46377 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 52b4b356ac5..29a446c2f5d 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 5078d0cc438..27aab38926d 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 cf988341263..b573bdc64f6 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 19543bc2b6f..29fcce94eb1 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 bbdd53ea8d1..8471dffe832 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 8fe3cad77a7..094a9f960cd 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 9565f7c2226..69281792019 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 d926449a54e..7a7640a49c7 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 2f03a9d314b..a164796dd87 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 6d225d94999..067d4f725d8 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 e7a2bcb7dbc..4ef4cacd97d 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 6f96b9cae51..b6bbc01304a 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 34c8da2fcf4..813d326cdaf 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 162e02fb446..3457c598857 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 440776fcb73..6023f8128ef 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 c98d79498de..c58545be04b 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 052d4b9ca57..65d7dd1430f 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 3380d9efb59..755f59eee98 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 b1078552263..beecf1838e4 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 065e8c7f3b1..3e2394092a3 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 432e380cca6..f03e4252976 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 50fc9625d02..8595c93692a 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 6dd169a0701..b6232422567 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 71ffcc236bf..5c0b729ccd9 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 f02f3ad04d7..48172de1d0f 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 edc26b0e1a0..567a037089d 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 2348accae6d..64f017ab77f 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 4ff797baa69..972df00d43f 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 384885aa5ed..30d47838073 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 fc70dc6a732..70481b5d0c8 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 6563335f91d..5d300b13f34 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 e2e871a9cb6..52a22a97584 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 8dc30be8b72..0fee2ed921c 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 ca5229cd2fe..886f2e9d86f 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 66bb00065fc..f60d15b9db1 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 6b9436e2b20..5b2e084a224 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 62a2a8f6aa4..3af4135be7e 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 d93d23ccfc0..18eec717630 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 5803ab55d3f..c22f698d31d 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 6bf1889140a..595482c22e9 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 7c89fc15616..2b3e1bb0d1c 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 71b91b54e7f..14c89a97411 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 85c6e065d33..b4a3cc0445c 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 7d0768fa347..774ecb41938 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 79226865ec7..5d89ed34cbb 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 03260c33358..233a26a38f5 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 84c647957c3..a5edf04a432 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 dd2a549606a..61d59689822 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 c5d2c1d889a..32abeb03fb4 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 9b582782c60..b13584da51c 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 267a1b851c9..7c563b7b045 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 73317afc314..0b37efeafa3 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 b250a53e602..e5571b240dc 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 34a408a1033..b1917c9d3f5 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 f47932df00e..525a5277d86 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 51b2de2f21b..609b4c2c3be 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 0c4ac64c0fe..a8f6fbf9cff 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 15bc43b489f..c76d290a57d 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 f5620554d17..c43b0d82853 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 d4f37a34e36..d838449452a 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 f35a0cedabd..db17939a8c8 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 1ac1cac8d3a..4ccaab5b473 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 44612305557..5a967bbed7e 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 5fafee280b2..166b8397ada 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 2ae167fd42a..23f1e378e62 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 2bc531c463e..f8e741ab6fc 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 432eceaf351..673056ce517 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 20848a6b19f..f12e9f7f6d5 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 a6b724e889c..fa48cd2818c 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 2990b529c00..0bbc9847537 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 c9c72c94ce2..61b577e98ee 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 d7d98cd03f8..25088da8ed5 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 b005db8278e..23303107459 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 aa307be06ac..23a0bed77d2 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 8b4b0bfd189..29913601961 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
*/