| Message ID | 20200513191523.3141-3-urjaman@gmail.com |
|---|---|
| State | Accepted |
| Commit | fffdf7290cee85232ee522e27c09c7f1178e6219 |
| Headers | show |
| Series | Making veyrons boot, 2020 edition | expand |
On 2020/5/14 ??3:15, Urja Rannikko wrote: > Previously veyron_init() was called in board_init() context, which is > called after relocation. Moving it to veyron.c used board_early_init_f > which is called way earlier, and causes veyron_init to hang. > Using board_early_init_r instead fixes this. > > Fixes: b678f2790c ("rockchip: rk3288: Move veyron_init() back to veyron.c") > Signed-off-by: Urja Rannikko <urjaman at gmail.com> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > board/google/veyron/veyron.c | 2 +- > configs/chromebit_mickey_defconfig | 1 + > configs/chromebook_jerry_defconfig | 2 +- > configs/chromebook_minnie_defconfig | 1 + > configs/chromebook_speedy_defconfig | 2 +- > 5 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c > index 6b9c34818b..04321094ef 100644 > --- a/board/google/veyron/veyron.c > +++ b/board/google/veyron/veyron.c > @@ -68,7 +68,7 @@ static int veyron_init(void) > } > #endif > > -int board_early_init_f(void) > +int board_early_init_r(void) > { > struct udevice *dev; > int ret; > diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig > index b1ad7bdd1d..b290f0fcb9 100644 > --- a/configs/chromebit_mickey_defconfig > +++ b/configs/chromebit_mickey_defconfig > @@ -19,6 +19,7 @@ CONFIG_USE_PREBOOT=y > CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_BOARD_EARLY_INIT_R=y > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 > diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig > index 16eee2238b..f6bdf80aee 100644 > --- a/configs/chromebook_jerry_defconfig > +++ b/configs/chromebook_jerry_defconfig > @@ -20,7 +20,7 @@ CONFIG_LOG=y > CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-jerry.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_BOARD_EARLY_INIT_R=y > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 > diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig > index 2c0415431f..c229177f64 100644 > --- a/configs/chromebook_minnie_defconfig > +++ b/configs/chromebook_minnie_defconfig > @@ -20,6 +20,7 @@ CONFIG_SILENT_CONSOLE=y > CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_BOARD_EARLY_INIT_R=y > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 > diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig > index b4116a34e6..be434871ff 100644 > --- a/configs/chromebook_speedy_defconfig > +++ b/configs/chromebook_speedy_defconfig > @@ -20,7 +20,7 @@ CONFIG_SILENT_CONSOLE=y > CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-speedy.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_BOARD_EARLY_INIT_R=y > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c index 6b9c34818b..04321094ef 100644 --- a/board/google/veyron/veyron.c +++ b/board/google/veyron/veyron.c @@ -68,7 +68,7 @@ static int veyron_init(void) } #endif -int board_early_init_f(void) +int board_early_init_r(void) { struct udevice *dev; int ret; diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index b1ad7bdd1d..b290f0fcb9 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -19,6 +19,7 @@ CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 16eee2238b..f6bdf80aee 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -20,7 +20,7 @@ CONFIG_LOG=y CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-jerry.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index 2c0415431f..c229177f64 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -20,6 +20,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig index b4116a34e6..be434871ff 100644 --- a/configs/chromebook_speedy_defconfig +++ b/configs/chromebook_speedy_defconfig @@ -20,7 +20,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-speedy.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
Previously veyron_init() was called in board_init() context, which is called after relocation. Moving it to veyron.c used board_early_init_f which is called way earlier, and causes veyron_init to hang. Using board_early_init_r instead fixes this. Fixes: b678f2790c ("rockchip: rk3288: Move veyron_init() back to veyron.c") Signed-off-by: Urja Rannikko <urjaman at gmail.com> --- board/google/veyron/veyron.c | 2 +- configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 2 +- configs/chromebook_minnie_defconfig | 1 + configs/chromebook_speedy_defconfig | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-)