random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-31 12:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

sunxi: Restore lowlevel_init usage

Browse Source 
2 recent sunxi changes have removed the usage of lowlevel_init by moving some
code around and then setting CONFIG_SKIP_LOWLEVEL_INIT.
This is problematic for 2 reasons:

1) It does not just stop s_init from being called, it also stops
cpu_init_cp15 from getting called, which is undesirable.

2) We want u-boot.bin to be usable standalone, without SPL, some people e.g.
use an upstream u-boot.bin together with Allwinner's boot0 loader. So
u-boot.bin must (re)initialize the gpios, timer, etc.

This commit restores the lowlevel_init / s_init usage, while keeping the
changes to no longer use the global-data (gd) struct in the SPL.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2015-01-21 16:24:05 +01:00 committed by Tom Rini
parent 768f6096f9
commit b56f6e2b4e
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
arch/arm/cpu/armv7/sunxi/board.c
View File

@ -27,26 +27,6 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#ifdef CONFIG_SPL_BUILD
/* Pointer to the global data structure for SPL */
DECLARE_GLOBAL_DATA_PTR;
/* The sunxi internal brom will try to loader external bootloader
* from mmc0, nand flash, mmc2.
* Unfortunately we can't check how SPL was loaded so assume
* it's always the first SD/MMC controller
*/
u32 spl_boot_device(void)
{
return BOOT_DEVICE_MMC1;
}
/* No confirmation data available in SPL yet. Hardcode bootmode */
u32 spl_boot_mode(void)
{
return MMCSD_MODE_RAW;
}
static int gpio_init(void) static int gpio_init(void)
{ {
#if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F) #if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F)
@ -85,7 +65,7 @@ static int gpio_init(void)
return 0; return 0;
} }
void board_init_f(ulong dummy) void s_init(void)
{ {
#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I #if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I
/* Magic (undocmented) value taken from boot0, without this DRAM /* Magic (undocmented) value taken from boot0, without this DRAM
@ -105,7 +85,27 @@ void board_init_f(ulong dummy)
timer_init(); timer_init();
gpio_init(); gpio_init();
i2c_init_board(); i2c_init_board();
}
#ifdef CONFIG_SPL_BUILD
/* The sunxi internal brom will try to loader external bootloader
* from mmc0, nand flash, mmc2.
* Unfortunately we can't check how SPL was loaded so assume
* it's always the first SD/MMC controller
*/
u32 spl_boot_device(void)
{
return BOOT_DEVICE_MMC1;
}
/* No confirmation data available in SPL yet. Hardcode bootmode */
u32 spl_boot_mode(void)
{
return MMCSD_MODE_RAW;
}
void board_init_f(ulong dummy)
{
preloader_console_init(); preloader_console_init();
#ifdef CONFIG_SPL_I2C_SUPPORT #ifdef CONFIG_SPL_I2C_SUPPORT

1
include/configs/sunxi-common.h
View File

@ -109,7 +109,6 @@
#define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SKIP_LOWLEVEL_INIT
/* Boot Argument Buffer Size */ /* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE