karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / board / karo / tx6 / config.mk

diff --git a/board/karo/tx6/config.mk b/board/karo/tx6/config.mk
index c8af7c793e1ed8495146032e806ed52cb03f53e5..c1215d5a49e623c280b622c8a59c87c9b3f99f3d 100644 (file)
--- a/board/karo/tx6/config.mk
+++ b/board/karo/tx6/config.mk
@@ -1,12 +1,14 @@
 # stack is allocated below CONFIG_SYS_TEXT_BASE
 CONFIG_SYS_TEXT_BASE := 0x10100000
 
+__HAVE_ARCH_GENERIC_BOARD := y
+
 LOGO_BMP = logos/karo.bmp
 #PLATFORM_CPPFLAGS += -DDEBUG
 #PLATFORM_CPPFLAGS += -Wno-unused-but-set-variable
 PLATFORM_CPPFLAGS += -Werror
 
-ifeq ($(CONFIG_NO_NAND),)
+ifeq ($(CONFIG_TX6_NAND),y)
 # calculate U_BOOT_IMG_SIZE to be at least 3 eraseblocks larger than the maximum expected image size
 CONFIG_SYS_NAND_BLOCK_SIZE := 131072
 ifeq ($(CONFIG_SYS_NAND_BLOCKS),)
@@ -52,4 +54,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_SYS_MMC_BOOT_PART_SIZE=$(CONFIG_SYS_MMC_BOOT_PART_
 PLATFORM_CPPFLAGS += -DCONFIG_ENV_OFFSET=$(shell printf "0x%x" $(CONFIG_ENV_OFFSET))
 PLATFORM_CPPFLAGS += -DCONFIG_SYS_DTB_OFFSET=$(shell printf "0x%x" $(CONFIG_SYS_DTB_OFFSET))
 PLATFORM_CPPFLAGS += -DCONFIG_SYS_DTB_BLKNO=$(shell printf "0x%x" `expr $(CONFIG_SYS_DTB_OFFSET) / 512`)
-endif # CONFIG_NO_NAND
+endif # CONFIG_TX6_NAND