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 21b573a7..0f7b820 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -317,7 +317,6 @@
## ARM11 Systems
#########################################################################
LIST_ARM11="$(boards_by_cpu arm1136) \
- apollon \
imx31_phycore \
imx31_phycore_eet \
mx31pdk \
diff --git a/Makefile b/Makefile
index 8c47d72..773073f 100644
--- a/Makefile
+++ b/Makefile
@@ -716,16 +716,6 @@
@$(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
#########################################################################
smdk6400_noUSB_config \
diff --git a/boards.cfg b/boards.cfg
index f2789d2..2e7f5b8 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -45,6 +45,7 @@
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 7fcf437..8f06cd7 100644
--- 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 */