Merge branch 'master' of /home/wd/git/u-boot/custodians

[u-boot] / board / korat / config.mk

diff --git a/board/korat/config.mk b/board/korat/config.mk
index fa8374f17f77c0e3f35ed95ee2863b4c34492f51..63e84dc74d16865384b5fa0577be4591a96f21d7 100644 (file)
--- a/board/korat/config.mk
+++ b/board/korat/config.mk
@@ -35,13 +35,9 @@ PLATFORM_CPPFLAGS += -fno-schedule-insns -fno-schedule-insns2
 endif
 
 ifeq ($(dbcr),1)
-PLATFORM_CPPFLAGS += -DCFG_INIT_DBCR=0x8CFF0000
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8CFF0000
 endif
 
-ifeq ($(perm),1)
-PLATFORM_CPPFLAGS += -DCONFIG_KORAT_PERMANENT
-TEXT_BASE = 0xFFFA0000
-else
-TEXT_BASE = 0xF7F60000
+ifndef CONFIG_KORAT_PERMANENT
 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-F7FC.lds
 endif