X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=board%2Fkaro%2Ftx6%2Fconfig.mk;h=5e38c40a576ec6a336350d77d7985a6596cc0144;hb=3054d43b45eff6d66e4e11341c94a01f67765905;hp=c1215d5a49e623c280b622c8a59c87c9b3f99f3d;hpb=782323c470d7836ff31d1cd7fa978ef161e9cf66;p=karo-tx-uboot.git

diff --git a/board/karo/tx6/config.mk b/board/karo/tx6/config.mk
index c1215d5a49..5e38c40a57 100644
--- a/board/karo/tx6/config.mk
+++ b/board/karo/tx6/config.mk
@@ -1,20 +1,29 @@
 # stack is allocated below CONFIG_SYS_TEXT_BASE
-CONFIG_SYS_TEXT_BASE := 0x10100000
+ifeq ($(CONFIG_SOC_MX6SX)$(CONFIG_SOC_MX6SL)$(CONFIG_BOARD_TX6UL),)
+	CONFIG_SYS_TEXT_BASE := 0x100ff000
+else
+	CONFIG_SYS_TEXT_BASE := 0x800ff000
+endif
 
-__HAVE_ARCH_GENERIC_BOARD := y
+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),)
+	# promote config variable to linker script
+	PLATFORM_CPPFLAGS += -DCONFIG_SECURE_BOOT
+endif
+
 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),)
 CONFIG_SYS_NAND_BLOCKS := 1024
 endif
 ifneq ($(CONFIG_SYS_NAND_BLOCK_SIZE),)
+# calculate U_BOOT_IMG_SIZE to be at least 3 eraseblocks larger than the maximum expected image size
 CONFIG_U_BOOT_IMG_SIZE := $(shell echo 'e=$(CONFIG_SYS_NAND_BLOCK_SIZE);s=640*1024;s + (e - s % e) % e + 3*e' | bc)
 CONFIG_SYS_USERFS_SIZE := $(shell expr \( $(CONFIG_SYS_NAND_BLOCKS) - 12 \) \* $(CONFIG_SYS_NAND_BLOCK_SIZE) - $(CONFIG_U_BOOT_IMG_SIZE) - 38 \* 1048576)
 CONFIG_SYS_USERFS_SIZE2 := $(shell expr \( $(CONFIG_SYS_NAND_BLOCKS) - 15 \) \* $(CONFIG_SYS_NAND_BLOCK_SIZE) - $(CONFIG_U_BOOT_IMG_SIZE) - 38 \* 1048576)