diff options
author | Wolfgang Denk <wd@denx.de> | 2011-03-27 21:20:29 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-03-27 21:20:29 +0200 |
commit | c04bf5e9a45d7335681352faa125193258f8e976 (patch) | |
tree | ab512a5a8356b6f492100925acb63638a7c10ce9 /include/configs | |
parent | b0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff) | |
parent | 05858736f5f1050d776571451995db81e3f5a5d7 (diff) | |
download | u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.zip u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.gz u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/s5p_goni.h | 3 | ||||
-rw-r--r-- | include/configs/s5pc210_universal.h | 3 | ||||
-rw-r--r-- | include/configs/seaboard.h | 2 | ||||
-rw-r--r-- | include/configs/smdk6400.h | 5 | ||||
-rw-r--r-- | include/configs/smdkc100.h | 3 |
5 files changed, 15 insertions, 1 deletions
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index f53e798..597cf57 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -69,6 +69,9 @@ #define CONFIG_MMC 1 #define CONFIG_S5P_MMC 1 +/* PWM */ +#define CONFIG_PWM 1 + /* It should define before config_cmd_default.h */ #define CONFIG_SYS_NO_FLASH 1 diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index c033a8d..5915984 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -70,6 +70,9 @@ #define CONFIG_MMC 1 #define CONFIG_S5P_MMC 1 +/* PWM */ +#define CONFIG_PWM 1 + /* It should define before config_cmd_default.h */ #define CONFIG_SYS_NO_FLASH 1 diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index fd87560..59eef56 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -37,7 +37,7 @@ #define CONFIG_TEGRA2_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_TEGRA_SEABOARD +#define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD #define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */ #endif /* __CONFIG_H */ diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 671f2c7..c9acf58 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -44,6 +44,11 @@ #define CONFIG_PERIPORT_BASE 0x70000000 #define CONFIG_PERIPORT_SIZE 0x13 +#define CONFIG_SYS_IRAM_BASE 0x0c000000 /* Internal SRAM base address */ +#define CONFIG_SYS_IRAM_SIZE 0x2000 /* 8 KB of internal SRAM memory */ +#define CONFIG_SYS_IRAM_END (CONFIG_SYS_IRAM_BASE + CONFIG_SYS_IRAM_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_IRAM_END - GENERATED_GBL_DATA_SIZE) + #define CONFIG_SYS_SDRAM_BASE 0x50000000 /* input clock of PLL: SMDK6400 has 12MHz input clock */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index fb8b43c..1ae1234 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -68,6 +68,9 @@ #define CONFIG_SERIAL0 1 /* use SERIAL 0 on SMDKC100 */ #define CONFIG_SERIAL_MULTI 1 +/* PWM */ +#define CONFIG_PWM 1 + /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 |