Gabe Black (gabeblack(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3687
-gerrit
commit eead4e8dd8dd9d37b788601c5961bba2b0296c3e
Author: Gabe Black <gabeblack(a)google.com>
Date: Wed Jun 19 02:18:25 2013 -0700
pit: Stop compiling in the max77686 driver on pit.
That part isn't used on pit.
Change-Id: I48f3a10f7e6eb89b1e9630d2372b6865b4c12a7f
Signed-off-by: Gabe Black <gabeblack(a)chromium.org>
---
src/mainboard/google/pit/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/mainboard/google/pit/Kconfig b/src/mainboard/google/pit/Kconfig
index b3094a2..d7409d3 100644
--- a/src/mainboard/google/pit/Kconfig
+++ b/src/mainboard/google/pit/Kconfig
@@ -27,7 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_I2C
select BOARD_ROMSIZE_KB_4096
- select DRIVER_MAXIM_MAX77686
select CHROMEOS
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT
Gabe Black (gabeblack(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3683
-gerrit
commit 89464ccb8bda186938f260955aca4886c5cc02e8
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Wed Jun 19 12:02:47 2013 -0700
Samsung CPUs: Unify Kconfig
For all other CPUs, we unconditionally include the CPU Kconfig
files in the CPU directory, not in the vendor directory. Do the
same thing for the Exynos CPUs. This allows us to make CPU dependent
changes in the directory of that CPU alone.
Also, drop some unused Kconfig variables from the Exynos Kconfig
files.
Change-Id: I4e4c22a0693988834e619dd33d121bf994ed57e8
Signed-off-by: Stefan Reinauer <reinauer(a)chromium.org>
Signed-off-by: Gabe Black <gabeblack(a)chromium.org>
---
src/cpu/samsung/Kconfig | 22 ----------------------
src/cpu/samsung/exynos5250/Kconfig | 27 ++++++++++++---------------
src/cpu/samsung/exynos5420/Kconfig | 20 +++++++++++---------
3 files changed, 23 insertions(+), 46 deletions(-)
diff --git a/src/cpu/samsung/Kconfig b/src/cpu/samsung/Kconfig
index 54f4ed1..ae37403 100644
--- a/src/cpu/samsung/Kconfig
+++ b/src/cpu/samsung/Kconfig
@@ -1,24 +1,2 @@
-config CPU_SAMSUNG_EXYNOS5250
- depends on ARCH_ARMV7
- select HAVE_MONOTONIC_TIMER
- select HAVE_UART_SPECIAL
- select DEFAULT_BOOTBLOCK_CONSOLE
- select DEFAULT_EARLY_CONSOLE
- bool
- default n
-
-config CPU_SAMSUNG_EXYNOS5420
- depends on ARCH_ARMV7
- select HAVE_MONOTONIC_TIMER
- select HAVE_UART_SPECIAL
- select DEFAULT_EARLY_CONSOLE
- bool
- default n
-
-if CPU_SAMSUNG_EXYNOS5250
source src/cpu/samsung/exynos5250/Kconfig
-endif
-
-if CPU_SAMSUNG_EXYNOS5420
source src/cpu/samsung/exynos5420/Kconfig
-endif
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig
index 75d1178..d6c3f1e 100644
--- a/src/cpu/samsung/exynos5250/Kconfig
+++ b/src/cpu/samsung/exynos5250/Kconfig
@@ -1,3 +1,14 @@
+config CPU_SAMSUNG_EXYNOS5250
+ depends on ARCH_ARMV7
+ select HAVE_MONOTONIC_TIMER
+ select HAVE_UART_SPECIAL
+ select DEFAULT_BOOTBLOCK_CONSOLE
+ select DEFAULT_EARLY_CONSOLE
+ bool
+ default n
+
+if CPU_SAMSUNG_EXYNOS5250
+
config BOOTBLOCK_CPU_INIT
string
default "cpu/samsung/exynos5250/bootblock.c"
@@ -6,10 +17,6 @@ config BOOTBLOCK_CPU_INIT
bootblock must load microcode or copy data from ROM before
searching for the bootblock.
-config EXYNOS_ACE_SHA
- bool
- default n
-
# ROM image layout.
#
# 0x0000: vendor-provided BL1 (8k).
@@ -77,17 +84,6 @@ config CBFS_CACHE_SIZE
hex "size of CBFS cache data"
default 0x000017000
-# FIXME: This is for copying SPI content into SRAM temporarily and
-# will be removed when we have the SPI streaming driver implemented.
-config SPI_IMAGE_HACK
- hex
- default 0x02060000
-
-# FIXME: other magic numbers that should probably go away
-config XIP_ROM_SIZE
- hex
- default ROMSTAGE_SIZE
-
config SYS_SDRAM_BASE
hex
default 0x40000000
@@ -137,3 +133,4 @@ config CONSOLE_SERIAL_UART_ADDRESS
help
Map the UART names to the respective MMIO address.
+endif
diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/cpu/samsung/exynos5420/Kconfig
index 406ffd2..efa0b21 100644
--- a/src/cpu/samsung/exynos5420/Kconfig
+++ b/src/cpu/samsung/exynos5420/Kconfig
@@ -1,3 +1,13 @@
+config CPU_SAMSUNG_EXYNOS5420
+ depends on ARCH_ARMV7
+ select HAVE_MONOTONIC_TIMER
+ select HAVE_UART_SPECIAL
+ select DEFAULT_EARLY_CONSOLE
+ bool
+ default n
+
+if CPU_SAMSUNG_EXYNOS5420
+
config BOOTBLOCK_CPU_INIT
string
default "cpu/samsung/exynos5420/bootblock.c"
@@ -6,10 +16,6 @@ config BOOTBLOCK_CPU_INIT
bootblock must load microcode or copy data from ROM before
searching for the bootblock.
-config EXYNOS_ACE_SHA
- bool
- default n
-
# ROM image layout.
#
# 0x0000: vendor-provided BL1 (8k).
@@ -79,11 +85,6 @@ config CBFS_CACHE_SIZE
hex "size of CBFS cache data"
default 0x000013000
-# FIXME: other magic numbers that should probably go away
-config XIP_ROM_SIZE
- hex
- default ROMSTAGE_SIZE
-
config SYS_SDRAM_BASE
hex
default 0x20000000
@@ -133,3 +134,4 @@ config CONSOLE_SERIAL_UART_ADDRESS
help
Map the UART names to the respective MMIO address.
+endif
Gabe Black (gabeblack(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3693
-gerrit
commit 364fc7380cc69eead0d92607655a03dc6cfe3d50
Author: Ronald G. Minnich <rminnich(a)google.com>
Date: Wed Jun 19 15:46:25 2013 -0700
Exynos5420: add code to make sure resume will work on DRAM.
Found during a perusal of u-boot changes. It looks important.
For more info: http://git.chromium.org/gitweb/?p=chromiumos/third_party/u-boot.git;a=commi…
Change-Id: Ida2fe2a98be008a4bdfe594cf00d01a33b511b4f
Signed-off-by: Ronald G. Minnich <rminnich(a)google.com>
Signed-off-by: Gabe Black <gabeblack(a)chromium.org>
---
src/cpu/samsung/exynos5420/bootblock.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/cpu/samsung/exynos5420/bootblock.c b/src/cpu/samsung/exynos5420/bootblock.c
index d3d737e..5cc9ef6 100644
--- a/src/cpu/samsung/exynos5420/bootblock.c
+++ b/src/cpu/samsung/exynos5420/bootblock.c
@@ -19,10 +19,28 @@
#include "clk.h"
#include "wakeup.h"
+#include "cpu.h"
void bootblock_cpu_init(void);
void bootblock_cpu_init(void)
{
+ u32 ret;
+ /*
+ * During Suspend-Resume & S/W-Reset, as soon as PMU releases
+ * pad retention, CKE goes high. This causes memory contents
+ * not to be retained during DRAM initialization. Therfore,
+ * there is a new control register(0x100431e8[28]) which lets us
+ * release pad retention and retain the memory content until the
+ * initialization is complete.
+ */
+ if (read32(((void *)INF_REG_BASE + INF_REG1_OFFSET)) == S5P_CHECK_SLEEP) {
+ write32(PAD_RETENTION_DRAM_COREBLK_VAL,
+ (void *)PAD_RETENTION_DRAM_COREBLK_OPTION);
+ do {
+ ret = read32((void *)PAD_RETENTION_DRAM_STATUS);
+ } while (ret != 0x1);
+ }
+
/* kick off the multi-core timer.
* We want to do this as early as we can.
*/
Gabe Black (gabeblack(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3692
-gerrit
commit 2d6f474b35004b8298fffd86a30fefc6bc08a825
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Wed Jun 12 17:07:05 2013 -0700
ARMv7: Drop duplicate call to bootblock_cpu_init()
This is already called in ARMv7 bootblock_simple.c so we don't
want to do it twice
Change-Id: I80cb41035b8a77787e04f2ea58a1cd372cea97d8
Signed-off-by: Stefan Reinauer <reinauer(a)chromium.org>
Signed-off-by: Gabe Black <gabeblack(a)chromium.org>
---
src/arch/armv7/include/bootblock_common.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/arch/armv7/include/bootblock_common.h b/src/arch/armv7/include/bootblock_common.h
index 39af453..2fa705f 100644
--- a/src/arch/armv7/include/bootblock_common.h
+++ b/src/arch/armv7/include/bootblock_common.h
@@ -7,8 +7,5 @@
#else
static void bootblock_mainboard_init(void)
{
-#ifdef CONFIG_BOOTBLOCK_CPU_INIT
- bootblock_cpu_init();
-#endif
}
#endif
Gabe Black (gabeblack(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3694
-gerrit
commit 33a7a7826d25ca9b0d072d4d239f1c9a5af5813a
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Wed Jun 19 15:44:36 2013 -0700
Don't try to use CBMEM console in bootblock
Otherwise we have to worry about hand off between bootblock and
romstage. Too much complexity
Change-Id: I89bf8a229dba7e1330accadf9a732d831ebc4827
Signed-off-by: Stefan Reinauer <reinauer(a)chromium.org>
Signed-off-by: Gabe Black <gabeblack(a)chromium.org>
---
src/arch/armv7/early_console.c | 2 +-
src/console/console.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/arch/armv7/early_console.c b/src/arch/armv7/early_console.c
index 68e81c6..84f97ba 100644
--- a/src/arch/armv7/early_console.c
+++ b/src/arch/armv7/early_console.c
@@ -41,7 +41,7 @@ void console_tx_byte(unsigned char byte)
#if CONFIG_USBDEBUG
usbdebug_tx_byte(0, byte);
#endif
-#if CONFIG_CONSOLE_CBMEM
+#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__)
cbmemc_tx_byte(byte);
#endif
}
diff --git a/src/console/console.c b/src/console/console.c
index c53adc6..a0e8f6d 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -117,7 +117,7 @@ void console_init(void)
#if CONFIG_CONSOLE_NE2K
ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
#endif
-#if CONFIG_CONSOLE_CBMEM
+#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__)
cbmemc_init();
#endif
#if CONFIG_SPKMODEM