From d157ec3412960375dee37e7845bb5e6315397d6a Mon Sep 17 00:00:00 2001 From: Michael Brandt Date: Thu, 7 Jan 2010 16:08:03 +0100 Subject: PACK3 changes applied PACK3 changes: * cpu/arm_cortexa9/start.S: reset register changed, but U-Boot reset command still does not work. * config.mk: build address changed to 0x05FC0000 * board/st/u8500/mmc.c: MBR change: descrease 4th partition size (userfs 2) from 0x00c0'0000 to 0x00b9'a000 sectors (6,442,450,944 to 6,228,541,440 bytes). * board\st\u8500\init_mmc.c: modify bootargs to set board_id to HREF or MOP. Is is an extremly ugly solution. It modifies the bootargs env variable directly (bootargs[9] = board_id;), instead of setting a additional environment variable board_id and use it in the bootargs envvar. * board/st/u8500/mmc.c: undocumented clock changes. * board/st/u8500/mmc_utils.c: new routine to switch to 4-bit interface. The switch is done in mmc_read_file(). It would make more sense to do so in mmc_init. * board/st/u8500/u8500.c: clock changes for HSI and I2C. I2C is now clocked by SOC1 PLL and runs with 24 MHz (depends on boot ROM SOC1 initialisation) --- board/st/u8500/u8500.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100755 => 100644 board/st/u8500/u8500.c (limited to 'board/st/u8500/u8500.c') diff --git a/board/st/u8500/u8500.c b/board/st/u8500/u8500.c old mode 100755 new mode 100644 index 3c627c7b0..5be3f5149 --- a/board/st/u8500/u8500.c +++ b/board/st/u8500/u8500.c @@ -186,12 +186,12 @@ int dram_init(void) unsigned int addr_vall_arr[] = { 0x8011F000, 0x0000FFFF, // Clocks for HSI TODO Enable reqd only -0x8011F008, 0x00001C44, // Clocks for HSI TODO Enable reqd only +0x8011F008, 0x00001CFF, // Clocks for HSI TODO Enable reqd only 0x8000F000, 0x00007FFF, // Clocks for I2C TODO Enable reqd only 0x8000F008, 0x00007FFF, // Clocks for I2C TODO Enable reqd only 0x8000E120, 0x003C0000, // GPIO for I2C/SD 0x8000E124, 0x00000000, // GPIO for I2C/SD -0x80157020, 0x00000130, // I2C 48MHz clock +0x80157020, 0x00000150, // I2C 48MHz clock 0x8012F000, 0x00007FFF, // Clocks for SD TODO Enable reqd only 0x8012F008, 0x00007FFF, // Clocks for SD TODO Enable reqd only 0xA03DF000, 0x0000000D, // Clock for MTU Timers @@ -199,6 +199,7 @@ unsigned int addr_vall_arr[] = { 0x8011E004, 0x0000FFE0, // GPIO ALT FUNC for EMMC 0x8011E020, 0x0000FFE0, // GPIO ALT FUNC for EMMC 0x8011E024, 0x00000000, // GPIO ALT FUNC for EMMC +0x8012E000, 0x20000000, // GPIO ALT FUNC for UART 0x8012E00C, 0x00000000, // GPIO ALT FUNC for SD 0x8012E004, 0x0FFC0000, // GPIO ALT FUNC for SD 0x8012E020, 0x60000000, // GPIO ALT FUNC for SD -- cgit v1.2.3