karo: tx6: cleanup HAB functions

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

diff --git a/board/karo/tx6/config.mk b/board/karo/tx6/config.mk
index 3326141157e9414d1f9061954ddd779a3c22757b..acb0cd0d51e4e6a1409b6f23911e5940858f4290 100644 (file)
--- a/board/karo/tx6/config.mk
+++ b/board/karo/tx6/config.mk
@@ -1,12 +1,19 @@
 # stack is allocated below CONFIG_SYS_TEXT_BASE
-CONFIG_SYS_TEXT_BASE := 0x10100000
+#CONFIG_SYS_TEXT_BASE := 0x10100000
+#CONFIG_SYS_TEXT_BASE := 0x177ff000
+CONFIG_SYS_TEXT_BASE := 0x100ff000
+
+OBJCOPYFLAGS += -j .pad
 
 LOGO_BMP = logos/karo.bmp
 #PLATFORM_CPPFLAGS += -DDEBUG
 #PLATFORM_CPPFLAGS += -Wno-unused-but-set-variable
 PLATFORM_CPPFLAGS += -Werror
+ifneq ($(CONFIG_SECURE_BOOT),)
+       PLATFORM_CPPFLAGS += -DCONFIG_SECURE_BOOT
+endif
 
-ifeq ($(CONFIG_TX6_V2),)
+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),)
@@ -33,7 +40,11 @@ PLATFORM_CPPFLAGS += -DCONFIG_SYS_NAND_BBT_SIZE=$(shell printf "%uk" `expr $(CON
 PLATFORM_CPPFLAGS += -DCONFIG_SYS_NAND_BBT_OFFSET=$(shell printf "0x%x" `expr \( $(CONFIG_SYS_NAND_BLOCKS) - $(CONFIG_SYS_NAND_BBT_BLOCKS) \) \* $(CONFIG_SYS_NAND_BLOCK_SIZE)`)
 endif # CONFIG_SYS_NAND_BLOCK_SIZE
 else
-CONFIG_SYS_MMC_BOOT_PART_SIZE := $(shell expr 4096 \* 1024)
+ifneq ($(CONFIG_MMC_BOOT_SIZE),)
+       CONFIG_SYS_MMC_BOOT_PART_SIZE := $(shell expr $(CONFIG_MMC_BOOT_SIZE) \* 1024)
+else
+       CONFIG_SYS_MMC_BOOT_PART_SIZE := $(shell expr 4096 \* 1024)
+endif
 CONFIG_U_BOOT_IMG_SIZE := $(shell expr 1 \* 1048576)
 CONFIG_MAX_DTB_SIZE := $(shell expr 64 \* 1024)
 CONFIG_ENV_SIZE := $(shell expr 128 \* 1024)
@@ -48,4 +59,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_TX6_V2
+endif # CONFIG_TX6_NAND