Merge pull request #5153 from knaerzche/rk-fix-u-boot-build

u-boot: Rockchip: fix random build issues
This commit is contained in:
Jernej Škrabec 2021-02-17 22:28:48 +01:00 committed by GitHub
commit 7e430828f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 17 deletions

View File

@ -0,0 +1,2 @@
CONFIG_BOOTDELAY=1
# CONFIG_EFI_LOADER is not set

View File

@ -241,11 +241,11 @@ devices = \
'RK3288': {
'miqi': {
'dtb': 'rk3288-miqi.dtb',
'config': 'miqi-rk3288_config'
'config': 'miqi-rk3288_defconfig'
},
'tinker': {
'dtb': 'rk3288-tinker-s.dtb',
'config': 'tinker-rk3288_config'
'config': 'tinker-rk3288_defconfig'
},
},
'RK3328': {
@ -265,63 +265,63 @@ devices = \
'RK3399': {
'firefly': {
'dtb': 'rk3399-firefly.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'hugsun-x99': {
'dtb': 'rk3399-hugsun-x99.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'khadas-edge': {
'dtb': 'rk3399-khadas-edge.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'khadas-edge-v': {
'dtb': 'rk3399-khadas-edge-v.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'nanopc-t4': {
'dtb': 'rk3399-nanopc-t4.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'nanopi-m4': {
'dtb': 'rk3399-nanopi-m4.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'nanopi-neo4': {
'dtb': 'rk3399-nanopi-neo4.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'orangepi': {
'dtb': 'rk3399-orangepi.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'rock960': {
'dtb': 'rk3399-rock960.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'rock-pi-4a': {
'dtb': 'rk3399-rock-pi-4a.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'rock-pi-4b': {
'dtb': 'rk3399-rock-pi-4b.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'rock-pi-4c': {
'dtb': 'rk3399-rock-pi-4c.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'rockpro64': {
'dtb': 'rk3399-rockpro64.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'roc-pc': {
'dtb': 'rk3399-roc-pc.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
'sapphire': {
'dtb': 'rk3399-sapphire.dtb',
'config': 'evb-rk3399_config'
'config': 'evb-rk3399_defconfig'
},
},
},