@@ -42,11 +42,6 @@
*/
#define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
/*
* Size of malloc() pool
*/
@@ -42,11 +42,6 @@
*/
#define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
/*
* Size of malloc() pool
*/
@@ -36,6 +36,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_SERIAL_TAG /* Add SERIAL ATAG */
/* Platform defaults */
#include <configs/omap3_common.h>
@@ -51,7 +52,6 @@
#define CONFIG_SYS_TEXT_BASE 0x80008000
-#define CONFIG_OF_LIBFDT 1
/*
* The early kernel mapping on ARM currently only maps from the base of DRAM
* to the end of the kernel image. The kernel is loaded at DRAM base + 0x8000.
@@ -60,12 +60,6 @@
*/
#define CONFIG_SYS_BOOTMAPSZ 0x4000
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-#define CONFIG_SERIAL_TAG
-
/*
* Size of malloc() pool
*/
@@ -56,13 +56,6 @@
*/
#define CONFIG_SYS_TEXT_BASE 0x80100000
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
-#define CONFIG_OF_LIBFDT 1
-
/* Size of malloc() pool */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
/* Sector */
@@ -58,11 +58,6 @@
#define CONFIG_SYS_TEXT_BASE 0x80008000
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
/*
* Size of malloc() pool
*/
@@ -39,13 +39,6 @@
* Other configuration options
*/
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
-#define CONFIG_OF_LIBFDT 1
-
/*
* NS16550 Configuration
*/
@@ -42,7 +42,6 @@
#define CONFIG_SYS_CACHELINE_SIZE 64
-#define CONFIG_OF_LIBFDT
#define CONFIG_FIT
/*
@@ -51,11 +50,6 @@
*/
#define CONFIG_SYS_TEXT_BASE 0x80008000
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
/*
* Size of malloc() pool
*/
@@ -45,13 +45,6 @@
*/
#define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */
-#define CONFIG_OF_LIBFDT 1
-
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
/*
* Size of malloc() pool
*/
@@ -55,4 +55,11 @@
/* Portions of the init sequence that we want */
#define CONFIG_MISC_INIT_R
+/* Enable support for both device trees and ATAGS */
+#define CONFIG_OF_LIBFDT
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+#define CONFIG_REVISION_TAG
+
#endif /* __CONFIG_OMAP3_COMMON_H */
@@ -200,11 +200,6 @@
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_MAXARGS 16 /* max args for a command */
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
/* Size of Console IO buffer */
#define CONFIG_SYS_CBSIZE 512
@@ -46,11 +46,6 @@
#define CONFIG_SYS_TEXT_BASE 0x80400000
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
#define CONFIG_CMDLINE_EDITING /* cmd line edit/history */
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check keypress w/no delay */
@@ -35,6 +35,7 @@
* Values that differ from platform defaults or are unspecified.
*/
#define CONFIG_SDRC /* The chip has SDRC controller */
+#define CONFIG_SERIAL_TAG /* Add SERIAL ATAG */
/* Platform defaults */
#include <configs/omap3_common.h>
@@ -49,14 +50,6 @@
#define CONFIG_MVBLX /* working with mvBlueLYNX-X */
#define CONFIG_MACH_TYPE MACH_TYPE_MVBLX
-#define CONFIG_OF_LIBFDT 1
-
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-#define CONFIG_SERIAL_TAG 1
-
/*
* Size of malloc() pool
*/
@@ -36,13 +36,6 @@
*/
#define CONFIG_OMAP3_OVERO /* working with overo */
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
-#define CONFIG_OF_LIBFDT
-
/*
* Size of malloc() pool
*/
@@ -40,13 +40,6 @@
*/
#define CONFIG_OMAP3_PANDORA /* working with pandora */
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
-#define CONFIG_OF_LIBFDT 1
-
/*
* Size of malloc() pool
*/
@@ -56,13 +56,6 @@
*/
#define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
-#define CONFIG_OF_LIBFDT 1
-
/*
* Size of malloc() pool
* Total Size Environment - 256k
@@ -46,13 +46,6 @@
*/
#define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
-#define CONFIG_OF_LIBFDT 1
-
/*
* Size of malloc() pool
*/
@@ -47,13 +47,6 @@
*/
#define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1
-#define CONFIG_REVISION_TAG 1
-
-#define CONFIG_OF_LIBFDT 1
-
/*
* Size of malloc() pool
*/
@@ -42,11 +42,6 @@
#define CONFIG_SYS_CACHELINE_SIZE 64
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
/*
* Size of malloc() pool
*/
@@ -275,7 +270,6 @@
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000
-#define CONFIG_OF_LIBFDT
#define CONFIG_FIT
#define CONFIG_CMD_UBI
#define CONFIG_CMD_UBIFS
@@ -57,13 +57,6 @@
*/
#define CONFIG_SYS_TEXT_BASE 0x80100000
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
-#define CONFIG_OF_LIBFDT
-
/* Size of malloc() pool */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
/* Sector */
Consolidate all of the ATAGS defines into a single location and enable OF_LIBFDT support as well. Only omap3_mvblx and cm_t35 also pass the SERIAL ATAG. Signed-off-by: Tom Rini <trini@ti.com> --- include/configs/am3517_crane.h | 5 ----- include/configs/am3517_evm.h | 5 ----- include/configs/cm_t35.h | 8 +------- include/configs/devkit8000.h | 7 ------- include/configs/dig297.h | 5 ----- include/configs/igep00x0.h | 7 ------- include/configs/mcx.h | 6 ------ include/configs/omap3_beagle.h | 7 ------- include/configs/omap3_common.h | 7 +++++++ include/configs/omap3_evm_common.h | 5 ----- include/configs/omap3_logic.h | 5 ----- include/configs/omap3_mvblx.h | 9 +-------- include/configs/omap3_overo.h | 7 ------- include/configs/omap3_pandora.h | 7 ------- include/configs/omap3_sdp3430.h | 7 ------- include/configs/omap3_zoom1.h | 7 ------- include/configs/omap3_zoom2.h | 7 ------- include/configs/tam3517-common.h | 6 ------ include/configs/tricorder.h | 7 ------- 19 files changed, 9 insertions(+), 115 deletions(-)