From: Zhong Hongbo <bocui...@gmail.com>
Signed-off-by: Zhong Hongbo <bocui...@gmail.com>
---
Change for V4:
- None.
Change for V3:
- None.
Change for V2:
- None.
---
Makefile | 20 --------------------
board/samsung/smdk6400/config.mk | 4 +---
boards.cfg | 2 ++
include/configs/smdk6400.h | 2 +-
4 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/Makefile b/Makefile
index d57c15e..8af1d5d 100644
--- a/Makefile
+++ b/Makefile
@@ -711,26 +711,6 @@ SX1_config: unconfig
fi;
@$(MKCONFIG) -n $@ SX1 arm arm925t sx1
-#########################################################################
-## ARM1176 Systems
-#########################################################################
-smdk6400_noUSB_config \
-smdk6400_config : unconfig
- @mkdir -p $(obj)include $(obj)board/samsung/smdk6400
- @mkdir -p $(obj)nand_spl/board/samsung/smdk6400
- @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
- @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
- @if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then
\
- echo "RAM_TEXT = 0x57e00000" >>
$(obj)board/samsung/smdk6400/config.tmp;\
- else
\
- echo "RAM_TEXT = 0xc7e00000" >>
$(obj)board/samsung/smdk6400/config.tmp;\
- fi
- @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
- @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-
-#########################################################################
-#########################################################################
-
clean:
@rm -f $(obj)examples/standalone/82559_eeprom \
$(obj)examples/standalone/atmel_df_pow2 \
diff --git a/board/samsung/smdk6400/config.mk b/board/samsung/smdk6400/config.mk
index 6f04c2f..93a1a0d 100644
--- a/board/samsung/smdk6400/config.mk
+++ b/board/samsung/smdk6400/config.mk
@@ -21,10 +21,8 @@
#
# download area is 0x5000c000
-sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
-
ifndef CONFIG_NAND_SPL
-CONFIG_SYS_TEXT_BASE = $(RAM_TEXT)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAM_TEXT)
else
CONFIG_SYS_TEXT_BASE = 0
endif
diff --git a/boards.cfg b/boards.cfg
index 2d36d83..0363b41 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -47,6 +47,8 @@ flea3 arm arm1136 -
CarMedi
mx35pdk arm arm1136 -
freescale mx35
apollon arm arm1136 apollon
- omap24xx
omap2420h4 arm arm1136 - ti
omap24xx
+smdk6400 arm arm1176 smdk6400
samsung s3c64xx smdk6400:NAND_U_BOOT,RAM_TEXT=0xc7e00000
+smdk6400_nousb arm arm1176 smdk6400
samsung s3c64xx smdk6400:NAND_U_BOOT,RAM_TEXT=0x57e00000
tnetv107x_evm arm arm1176 tnetv107xevm ti
tnetv107x
integratorap_cm720t arm arm720t integrator
armltd - integratorap:CM720T
integratorap_cm920t arm arm920t integrator
armltd - integratorap:CM920T
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index 04caeef..47326d6 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -54,7 +54,7 @@
/* input clock of PLL: SMDK6400 has 12MHz input clock */
#define CONFIG_SYS_CLK_FREQ 12000000
-#if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000)
+#if !defined(CONFIG_NAND_U_BOOT) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000)
#define CONFIG_ENABLE_MMU
#endif
--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
