diff options
author | Stefan Roese <sr@denx.de> | 2010-09-16 14:01:53 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2010-09-23 08:49:49 +0200 |
commit | 8a805df13615667ebdcc9f3a3a6fbf6c7778a992 (patch) | |
tree | 67e61ba7679d82a64dbcb3d55344a31a22a7e6da /include/configs | |
parent | ab25e880ca9d508b7a807aa969105af32c3e6e51 (diff) |
ppc4xx/fdt/flash: Change fdt_fixup_nor_flash_node() to not rely on cs size
This patch changes the behaviour of the fdt_fixup_nor_flash_node()
function. Now it doesn't patch the size of the "reg" property with the
chip-select size, but with the size returned from the new function
flash_get_bank_size(). This function will return per weak default the
flash size of the bank (bank = chip-select numer) detected by the flash
driver. If this does not fit your needs, this function may be overridden
by a board specific one.
For this the parameters needed to be changed. So I intentionally squashed
the PPC4xx stuff using this routine into this patch. Otherwise it would
not be git-bisectable anymore.
The board specific function for the AMCC/APM Ebony eval board is now
included in this patch version.
Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Detlev Zundel <dzu@denx.de>
Cc: Gerald Van Baren <vanbaren@cideas.com>
Cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/acadia.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/configs/acadia.h b/include/configs/acadia.h index bd3388f626..8b01c704fd 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -120,7 +120,13 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #else -#define CONFIG_SYS_NO_FLASH 1 /* No NOR on Acadia when NAND-booting */ +/* + * No NOR-flash on Acadia when NAND-booting. We need to undef the + * NOR device-tree fixup code as well, since flash_info is not defined + * in this case. + */ +#define CONFIG_SYS_NO_FLASH 1 +#undef CONFIG_FDT_FIXUP_NOR_FLASH_SIZE #endif #ifdef CONFIG_ENV_IS_IN_FLASH |