ARM: convert "apollon" board to use boards.cfg

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>

diff --git a/MAKEALL b/MAKEALL
index 21b573a714001a20e5b757d8c8bcb98f8f739671..0f7b82002cefbd0d2ac4214c024322b79553dc03 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -317,7 +317,6 @@ LIST_ARM9="$(boards_by_cpu arm920t) \
 ## ARM11 Systems
 #########################################################################
 LIST_ARM11="$(boards_by_cpu arm1136)   \
-       apollon                 \
        imx31_phycore           \
        imx31_phycore_eet       \
        mx31pdk                 \

diff --git a/Makefile b/Makefile
index 8c47d7250f59dbd22c7f28bab6ccf6ec63d37c1c..773073fc1f7f8edc8f4675bfc1524529040a3854 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -715,16 +715,6 @@ scpu_config:       unconfig
        fi
        @$(MKCONFIG) -n $@ -a pdnb3 arm ixp pdnb3 prodrive
 
-#########################################################################
-## ARM1136 Systems
-#########################################################################
-
-apollon_config         : unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
-       @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) $@ arm arm1136 apollon - omap24xx
-
 #########################################################################
 ## ARM1176 Systems
 #########################################################################

diff --git a/boards.cfg b/boards.cfg
index f2789d22adab8e14160b51afaff76de4ccfbe3ae..2e7f5b8be4c7c2348602b119aca710d3475824dc 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -45,6 +45,7 @@ tt01                         arm         arm1136     -                   hale
 imx31_litekit                arm         arm1136     -                   logicpd        mx31
 flea3                        arm         arm1136     -                   CarMediaLab    mx35
 mx35pdk                      arm         arm1136     -                   freescale      mx35
+apollon                             arm         arm1136     apollon             -              omap24xx
 omap2420h4                   arm         arm1136     -                   ti             omap24xx
 tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
 integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap:CM720T

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 7fcf437c6d00d019f24d3e45efa2f9257521819d..8f06cd708695af326efa1048e1d2150346c53cc2 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -37,6 +37,8 @@
 #define CONFIG_APOLLON         1
 #define CONFIG_APOLLON_PLUS    1 /* If you have apollon plus 1.x */
 
+#define CONFIG_ONENAND_U_BOOT  y
+
 /* Clock config to target*/
 #define PRCM_CONFIG_I          1
 /* #define PRCM_CONFIG_II      1 */