Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-16 23:07:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2019-10-06-master-imports'

Browse source 
- Regression work-around on SoCFPGA by disabling WDT in some cases.
- Fix seg fault on 'host info' in some cases.
This commit is contained in:
Tom Rini 2019-10-06 18:02:18 -04:00
commit 879396a240
17 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -59,7 +59,7 @@ stages:
fi;
fi;
build all 32bit ARM plaforms:
build all 32bit ARM platforms:
tags: [ 'all' ]
stage: world build
script:
@ -70,7 +70,7 @@ build all 32bit ARM plaforms:
exit $ret;
fi;
build all 64bit ARM plaforms:
build all 64bit ARM platforms:
tags: [ 'all' ]
stage: world build
script:
@ -84,7 +84,7 @@ build all 64bit ARM plaforms:
exit $ret;
fi;
build all PowerPC plaforms:
build all PowerPC platforms:
tags: [ 'all' ]
stage: world build
script:
@ -95,7 +95,7 @@ build all PowerPC plaforms:
exit $ret;
fi;
build all other plaforms:
build all other platforms:
tags: [ 'all' ]
stage: world build
script:

2
MAINTAINERS
View file

@ -366,7 +366,7 @@ F: arch/arm/include/asm/arch-stv0991/
ARM SUNXI
M: Jagan Teki <jagan@amarulasolutions.com>
M: Maxime Ripard <maxime.ripard@bootlin.com>
M: Maxime Ripard <mripard@kernel.org>
S: Maintained
T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git
F: arch/arm/cpu/armv7/sunxi/

6
board/sunxi/MAINTAINERS
View file

@ -151,7 +151,7 @@ F: configs/Bananapi_M2_Ultra_defconfig
F: arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
BANANAPI M2 MAGIC BOARD
M: Maxime Ripard <maxime.ripard@bootlin.com>
M: Maxime Ripard <mripard@kernel.org>
S: Maintained
F: configs/Bananapi_m2m_defconfig
F: arch/arm/dts/sun8i-r16-bananapi-m2m.dts
@ -179,7 +179,7 @@ F: configs/beelink_x2_defconfig
F: arch/arm/dts/sun8i-h3-beelink-x2.dts
COLOMBUS BOARD
M: Maxime Ripard <maxime.ripard@bootlin.com>
M: Maxime Ripard <mripard@kernel.org>
S: Maintained
F: configs/Colombus_defconfig
@ -465,7 +465,7 @@ F: configs/Sunchip_CX-A99_defconfig
W: https://linux-sunxi.org/Sunchip_CX-A99
TBS A711 BOARD
M: Maxime Ripard <maxime.ripard@bootlin.com>
M: Maxime Ripard <mripard@kernel.org>
S: Maintained
F: configs/tbs_a711_defconfig

2
cmd/host.c
View file

@ -89,7 +89,7 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc,
struct host_block_dev *host_dev;
#ifdef CONFIG_BLK
host_dev = dev_get_priv(blk_dev->bdev);
host_dev = dev_get_platdata(blk_dev->bdev);
#else
host_dev = blk_dev->priv;
#endif

1
configs/socfpga_arria10_defconfig
View file

@ -46,3 +46,4 @@ CONFIG_SPI=y
CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_DESIGNWARE_APB_TIMER=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_arria5_defconfig
View file

@ -65,3 +65,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_cyclone5_defconfig
View file

@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_dbm_soc1_defconfig
View file

@ -62,3 +62,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_de0_nano_soc_defconfig
View file

@ -61,3 +61,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_de10_nano_defconfig
View file

@ -57,3 +57,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_de1_soc_defconfig
View file

@ -47,4 +47,5 @@ CONFIG_SPI=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
# CONFIG_SPL_WDT is not set
# CONFIG_EFI_LOADER is not set

1
configs/socfpga_is1_defconfig
View file

@ -51,3 +51,4 @@ CONFIG_MII=y
CONFIG_DM_RESET=y
CONFIG_SPI=y
CONFIG_CADENCE_QSPI=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_mcvevk_defconfig
View file

@ -58,3 +58,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_sockit_defconfig
View file

@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_socrates_defconfig
View file

@ -68,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_sr1500_defconfig
View file

@ -57,3 +57,4 @@ CONFIG_MII=y
CONFIG_DM_RESET=y
CONFIG_SPI=y
CONFIG_CADENCE_QSPI=y
# CONFIG_SPL_WDT is not set

1
configs/socfpga_vining_fpga_defconfig
View file

@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
# CONFIG_SPL_WDT is not set