colibri_vf: change toradex config block offset type from hex to int

Allow specifying a negative number as the Toradex config block offset
by changing its type from hex to int. This is required in the eMMC case
where this is used to force a location at the end of respective
hardware boot partition.

While at it fix SPL compilation by not compiling configblock handling
in this case for now.

diff --git a/board/toradex/colibri_vf/Kconfig b/board/toradex/colibri_vf/Kconfig
index af60800d79f05055d04809f86a2d0bc3a1bf1b46..558c31d52475fa89f304fda3c95bf4884c96848d 100644 (file)
--- a/board/toradex/colibri_vf/Kconfig
+++ b/board/toradex/colibri_vf/Kconfig
@@ -22,7 +22,7 @@ config TRDX_HAVE_NAND
        default y
 
 config TRDX_CFG_BLOCK_OFFSET
-       default "0x800"
+       default "2048"
 
 config TRDX_CFG_BLOCK_2ND_ETHADDR
        default y

diff --git a/board/toradex/common/Kconfig b/board/toradex/common/Kconfig
index f924be5b291200c80c9b4b4591d19849278f0396..ca3ed9fb162c836b8d527a389f2a01930ea91b32 100644 (file)
--- a/board/toradex/common/Kconfig
+++ b/board/toradex/common/Kconfig
@@ -42,7 +42,7 @@ config TRDX_CFG_BLOCK_PART
        depends on TRDX_CFG_BLOCK_IS_IN_MMC
 
 config TRDX_CFG_BLOCK_OFFSET
-       hex "Toradex config block offset"
+       int "Toradex config block offset"
        help
          Specify the byte offset of the Toradex config block within the flash
          device the config block is stored on.

diff --git a/board/toradex/common/common.mk b/board/toradex/common/common.mk
index 4e8d908e5aecf0fa24752c8035cbb6e1ac90702d..e94ebbce4f755568f50b24bb46c809498827d83c 100644 (file)
--- a/board/toradex/common/common.mk
+++ b/board/toradex/common/common.mk
@@ -1,2 +1,7 @@
 # Common for all Toradex modules
+ifeq ($(CONFIG_SPL_BUILD),y)
+# necessary to create built-in.o
+obj- := __dummy__.o
+else
 obj-$(CONFIG_TRDX_CFG_BLOCK) += ../common/configblock.o
+endif