On Tuesday 07 August 2012 04:07:44 Bob Liu wrote:
--- a/arch/blackfin/include/asm/mach-bf609/portmux.h +++ b/arch/blackfin/include/asm/mach-bf609/portmux.h
this should be part of the initial commit of this header (one of the initial bf60x support patches)
--- a/board/bf609-ezkit/bf609-ezkit.c +++ b/board/bf609-ezkit/bf609-ezkit.c --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h
then squash these into the initial bf609-ezkit board patch
--- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -195,10 +195,12 @@ "nand erase 0 0x40000;" \ "nand write $(loadaddr) 0 0x40000" # else -# define UBOOT_ENV_UPDATE \ +# ifndef UBOOT_ENV_UPDATE +# define UBOOT_ENV_UPDATE \ "protect off 0x20000000 +$(filesize);" \ "erase 0x20000000 +$(filesize);" \ "cp.b $(loadaddr) 0x20000000 $(filesize)" +# endif # endif # ifdef CONFIG_NETCONSOLE # define NETCONSOLE_ENV \
replace the 0x20000000 with a define and then there's no need to override it # define UBOOT_ENV_UPDATE \ "protect off " MK_STR(CONFIG_SYS_FLASH_BASE) " +$(filesize);" \ "erase " MK_STR(CONFIG_SYS_FLASH_BASE) " +$(filesize);" \ "cp.b $(loadaddr) " MK_STR(CONFIG_SYS_FLASH_BASE) " $(filesize)" -mike