diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-04-16 18:28:15 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-04-16 18:28:15 +0200 |
| commit | f883e98833b5c37cae97c7678f170f84c20b6eb7 (patch) | |
| tree | b2ae517cfcd9cedf3237221f44f621f08b558371 | |
| parent | 8fdbc82b6b6eabfd7e137beaa8f62ec63f6cbe8c (diff) | |
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.
| -rw-r--r-- | board/toradex/colibri_vf/Kconfig | 2 | ||||
| -rw-r--r-- | board/toradex/common/Kconfig | 2 | ||||
| -rw-r--r-- | board/toradex/common/common.mk | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/board/toradex/colibri_vf/Kconfig b/board/toradex/colibri_vf/Kconfig index af60800d79f..558c31d5247 100644 --- 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 f924be5b291..ca3ed9fb162 100644 --- 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 4e8d908e5ae..e94ebbce4f7 100644 --- 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 |