From: Tom Rini Date: Sun, 6 Oct 2019 22:02:18 +0000 (-0400) Subject: Merge branch '2019-10-06-master-imports' X-Git-Tag: v2019.10~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=879396a2405d394573307adf16763cbe769c35f2;hp=dac51e9aaf6fd38298007b266feb6a80e9ec91ee;p=platform%2Fkernel%2Fu-boot.git Merge branch '2019-10-06-master-imports' - Regression work-around on SoCFPGA by disabling WDT in some cases. - Fix seg fault on 'host info' in some cases. --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1c5b4f..0c43434 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/MAINTAINERS b/MAINTAINERS index a9a1049..c536566 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -366,7 +366,7 @@ F: arch/arm/include/asm/arch-stv0991/ ARM SUNXI M: Jagan Teki -M: Maxime Ripard +M: Maxime Ripard S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git F: arch/arm/cpu/armv7/sunxi/ diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index c7e9d3e..88f1353 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -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 +M: Maxime Ripard 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 +M: Maxime Ripard 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 +M: Maxime Ripard S: Maintained F: configs/tbs_a711_defconfig diff --git a/cmd/host.c b/cmd/host.c index f7d3eae..98c4d2a 100644 --- a/cmd/host.c +++ b/cmd/host.c @@ -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 diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig index a2d555b..7cb214d 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -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 diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index d591c7e..9325467 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -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 diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 3f9766d..8e5b2e2 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -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 diff --git a/configs/socfpga_dbm_soc1_defconfig b/configs/socfpga_dbm_soc1_defconfig index c6c8f07..c73f382 100644 --- a/configs/socfpga_dbm_soc1_defconfig +++ b/configs/socfpga_dbm_soc1_defconfig @@ -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 diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index bbd9d7f..80ccb33 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -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 diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig index a2f5876..98e80b7 100644 --- a/configs/socfpga_de10_nano_defconfig +++ b/configs/socfpga_de10_nano_defconfig @@ -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 diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index fa2bace..efa128a 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -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 diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 9e58fd1..99cdb26 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -51,3 +51,4 @@ CONFIG_MII=y CONFIG_DM_RESET=y CONFIG_SPI=y CONFIG_CADENCE_QSPI=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index 39cc753..e977cd7 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -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 diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index a3c6af7..b570b9d 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -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 diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 1143cd3..9eac00e 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -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 diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 89349ce..092347a 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -57,3 +57,4 @@ CONFIG_MII=y CONFIG_DM_RESET=y CONFIG_SPI=y CONFIG_CADENCE_QSPI=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 6b2266f..c52afdd 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -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