diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | Makefile | 18 | ||||
| -rwxr-xr-x[-rw-r--r--] | common/Makefile | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | common/cmd_nvedit.c | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | drivers/serial/serial_pl01x.c | 5 |
5 files changed, 27 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 67d2cd62c..39fe4e38b 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ /LOG /errlog /reloc_off +build # stgit generated dirs patches-* diff --git a/Makefile b/Makefile index 5857b5252..25310ca4b 100644..100755 --- a/Makefile +++ b/Makefile @@ -3127,6 +3127,24 @@ omap3_zoom1_config : unconfig omap3_zoom2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3 +u8500_def_config \ +u8500_noconsole_config \ +u8500_auto_config: unconfig + @mkdir -p $(obj)include + @ > $(obj)include/config.h + @if [ "$(findstring _def, $@)" ] ; then \ + echo "#ifndef CONFIG_SKIP_LOWLEVEL_INIT " >> $(obj)include/config.h ; \ + echo "#define CONFIG_SKIP_LOWLEVEL_INIT 1" >> $(obj)include/config.h ; \ + echo "#endif" >> $(obj)include/config.h ; \ + elif [ "$(findstring _noconsole, $@)" ] ; then \ + echo "Configuring for no console ..." ; \ + echo "#ifndef CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h ; \ + echo "#define CONFIG_SKIP_LOWLEVEL_INIT 1" >> $(obj)include/config.h ; \ + echo "#endif" >> $(obj)include/config.h ; \ + echo "#define CONFIG_SILENT_CONSOLE 1" >> $(obj)include/config.h ; \ + fi; + @$(MKCONFIG) -a u8500 arm arm_cortexa9 u8500 st stw8500 + ######################################################################### ## XScale Systems ######################################################################### diff --git a/common/Makefile b/common/Makefile index 3781738e1..7ba449505 100644..100755 --- a/common/Makefile +++ b/common/Makefile @@ -61,6 +61,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o +COBJS-$(CONFIG_ENV_IS_IN_EMMC) += env_emmc.o COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o # command diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 2186205a1..3fe1fc239 100644..100755 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -60,9 +60,10 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_NVRAM) && \ !defined(CONFIG_ENV_IS_IN_ONENAND) && \ !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ + !defined(CONFIG_ENV_IS_IN_EMMC) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ -SPI_FLASH|MG_DISK|NVRAM|NOWHERE} +SPI_FLASH|MG_DISK|NVRAM|EMMC|NOWHERE} #endif #define XMK_STR(x) #x diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index c645cef87..839b0a812 100644..100755 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -144,6 +144,11 @@ int serial_init (void) IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH, (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN)); +#ifdef CONFIG_U8500 + /* program receive line control register */ + IO_WRITE(port[CONSOLE_PORT] + 0x1C, 0x70); +#endif + /* ** Finally, enable the UART */ |