leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://source.denx.de/u-boot/custodians/u-boot-sh

Browse Source
This commit is contained in:
Tom Rini
2021-08-08 09:08:22 -04:00
parent 8f07f5376a 0ae06f6b36
commit b721d0545f
15 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-rmobile/Kconfig
View File

@@ -17,6 +17,7 @@ config RCAR_GEN3
select PINCTRL select PINCTRL
select PINCONF select PINCONF
select PINCTRL_PFC select PINCTRL_PFC
select POSITION_INDEPENDENT
select SUPPORT_SPL select SUPPORT_SPL
imply CMD_FS_UUID imply CMD_FS_UUID
imply CMD_GPT imply CMD_GPT

3
board/renesas/condor/condor.c
View File

@@ -21,9 +21,6 @@ DECLARE_GLOBAL_DATA_PTR;
int board_init(void) int board_init(void)
{ {
/* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
return 0; return 0;
} }

3
board/renesas/draak/draak.c
View File

@@ -54,9 +54,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
/* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
/* USB1 pull-up */ /* USB1 pull-up */
setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);

3
board/renesas/eagle/eagle.c
View File

@@ -65,9 +65,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
/* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
return 0; return 0;
} }

3
board/renesas/ebisu/ebisu.c
View File

@@ -32,9 +32,6 @@ DECLARE_GLOBAL_DATA_PTR;
int board_init(void) int board_init(void)
{ {
/* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
return 0; return 0;
} }

3
board/renesas/salvator-x/salvator-x.c
View File

@@ -53,9 +53,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
/* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
/* USB1 pull-up */ /* USB1 pull-up */
setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);

3
board/renesas/ulcb/ulcb.c
View File

@@ -51,9 +51,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
/* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000;
/* USB1 pull-up */ /* USB1 pull-up */
setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);

1
configs/hihope_rzg2_defconfig
View File

@@ -12,7 +12,6 @@ CONFIG_TARGET_HIHOPE_RZG2=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
CONFIG_DEFAULT_FDT_FILE="r8a774a1-hihope-rzg2m.dtb" CONFIG_DEFAULT_FDT_FILE="r8a774a1-hihope-rzg2m.dtb"
# CONFIG_BOARD_EARLY_INIT_F is not set # CONFIG_BOARD_EARLY_INIT_F is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/r8a77970_eagle_defconfig
View File

@@ -14,7 +14,6 @@ CONFIG_TARGET_EAGLE=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
CONFIG_DEFAULT_FDT_FILE="r8a77970-eagle.dtb" CONFIG_DEFAULT_FDT_FILE="r8a77970-eagle.dtb"
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y

1
configs/r8a77980_condor_defconfig
View File

@@ -14,7 +14,6 @@ CONFIG_TARGET_CONDOR=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
CONFIG_DEFAULT_FDT_FILE="r8a77980-condor.dtb" CONFIG_DEFAULT_FDT_FILE="r8a77980-condor.dtb"
# CONFIG_BOARD_EARLY_INIT_F is not set # CONFIG_BOARD_EARLY_INIT_F is not set
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/r8a77990_ebisu_defconfig
View File

@@ -13,7 +13,6 @@ CONFIG_TARGET_EBISU=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
CONFIG_DEFAULT_FDT_FILE="r8a77990-ebisu.dtb" CONFIG_DEFAULT_FDT_FILE="r8a77990-ebisu.dtb"
# CONFIG_BOARD_EARLY_INIT_F is not set # CONFIG_BOARD_EARLY_INIT_F is not set
CONFIG_UPDATE_TFTP=y CONFIG_UPDATE_TFTP=y

1
configs/r8a77995_draak_defconfig
View File

@@ -13,7 +13,6 @@ CONFIG_TARGET_DRAAK=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
CONFIG_DEFAULT_FDT_FILE="r8a77995-draak.dtb" CONFIG_DEFAULT_FDT_FILE="r8a77995-draak.dtb"
CONFIG_UPDATE_TFTP=y CONFIG_UPDATE_TFTP=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

3
configs/rcar3_salvator-x_defconfig
View File

@@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_ARCH_RMOBILE=y CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SYS_TEXT_BASE=0x0
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
@@ -12,7 +12,6 @@ CONFIG_TARGET_SALVATOR_X=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
CONFIG_DEFAULT_FDT_FILE="r8a77950-salvator-x.dtb" CONFIG_DEFAULT_FDT_FILE="r8a77950-salvator-x.dtb"
CONFIG_UPDATE_TFTP=y CONFIG_UPDATE_TFTP=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/rcar3_ulcb_defconfig
View File

@@ -13,7 +13,6 @@ CONFIG_TARGET_ULCB=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
CONFIG_DEFAULT_FDT_FILE="r8a77950-ulcb.dtb" CONFIG_DEFAULT_FDT_FILE="r8a77950-ulcb.dtb"
CONFIG_UPDATE_TFTP=y CONFIG_UPDATE_TFTP=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

2
include/configs/rcar-gen3-common.h
View File

@@ -17,6 +17,8 @@
#define CONFIG_SPL_TARGET "spl/u-boot-spl.scif" #define CONFIG_SPL_TARGET "spl/u-boot-spl.scif"
#endif #endif
#define CONFIG_SYS_BOOTPARAMS_LEN SZ_128K
/* boot option */ /* boot option */
#define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_TAG