diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-06-19 22:14:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-19 22:14:57 +0200 |
| commit | df736bd695dd477c2aba99a01345782c597dab05 (patch) | |
| tree | 0073f8dbabef4885cd8aac29f616f9fb197c26ed /include/configs/km/km83xx-common.h | |
| parent | 8d75c8964baa76d097edb4aa4b0474600f2998ba (diff) | |
| parent | c1b3d84168ad423b3932f671c0863327fb005599 (diff) | |
| download | u-boot-imx-df736bd695dd477c2aba99a01345782c597dab05.zip u-boot-imx-df736bd695dd477c2aba99a01345782c597dab05.tar.gz u-boot-imx-df736bd695dd477c2aba99a01345782c597dab05.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
* 'master' of git://git.denx.de/u-boot-mpc83xx:
km/common: check test_bank and testpin for testboot
powerpc/83xx/km: readout dip_switch on kmcoge5ne
powerpc/83xx: configure CONFIG_POST for kmcoge5ne
powerpc/83xx/km: added missing enable of application buffer
km/common: increase bootlimit to 3
km/common: fixed error in ethaddr (1-byte-shift)
MAINTAINERS: cleanup for keymile boards
powerpc/83xx: add kmcoge5ne board support
km/common: add support for second flash
powerpc83xx/km: remove unneeded CONFIG_PCI for kmeter1
powerpc83xx/km: lock the window size to 2GiB befor fixing sdram size
powerpc/83xx/km: use tuxx1.h for kmsupx5 target
powerpc/83xx: increment malloc heap size for the MPC832x MDS boards
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/km/km83xx-common.h')
| -rw-r--r-- | include/configs/km/km83xx-common.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index 06ecb8a..877d841 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -15,13 +15,18 @@ #include "keymile-common.h" #include "km-powerpc.h" -#define MTDIDS_DEFAULT "nor0=boot" -#define MTDPARTS_DEFAULT "mtdparts=" \ +#ifndef MTDIDS_DEFAULT +# define MTDIDS_DEFAULT "nor0=boot" +#endif /* MTDIDS_DEFAULT */ + +#ifndef MTDPARTS_DEFAULT +# define MTDPARTS_DEFAULT "mtdparts=" \ "boot:" \ "768k(u-boot)," \ "128k(env)," \ "128k(envred)," \ - "-(" CONFIG_KM_UBI_PARTITION_NAME ")" + "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");" +#endif /* MTDPARTS_DEFAULT */ #define CONFIG_MISC_INIT_R /* @@ -49,6 +54,8 @@ */ #define CONFIG_SYS_DDR_BASE 0x00000000 /* DDR is system memory */ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_BASE +#define CONFIG_SYS_SDRAM_BASE2 (CONFIG_SYS_SDRAM_BASE + 0x10000000) /* +256M */ + #define CONFIG_SYS_DDR_SDRAM_BASE CONFIG_SYS_DDR_BASE #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL (DDR_SDRAM_CLK_CNTL_SS_EN | \ DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05) |