From a11cb57defa9fbf24a6ab5d729cecc84d2cf2db9 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sun, 6 Oct 2019 12:26:16 +0200 Subject: [PATCH 1/4] gitlab-ci: fix typo 'plaforms' %s/plaforms/platforms/g Signed-off-by: Heinrich Schuchardt Reviewed-by: Bin Meng --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1c5b4fc76..0c4343468d 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: From e263607a038a28e7655f8e38bb35daf5fe1291c8 Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Sat, 5 Oct 2019 22:10:11 +0200 Subject: [PATCH 2/4] arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10 These boards don't have a watchdog enabled in SPL, so make sure CONFIG_SPL_WDT is not enabled. Fixes: commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT") Signed-off-by: Simon Goldschmidt --- configs/socfpga_arria10_defconfig | 1 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_dbm_soc1_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de10_nano_defconfig | 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + 13 files changed, 13 insertions(+) diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig index a2d555b9b4..7cb214d655 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 d591c7e4d7..93254677e7 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 3f9766d0fb..8e5b2e2f66 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 c6c8f073ea..c73f3821e7 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 bbd9d7f4b4..80ccb33fbb 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 a2f58766cc..98e80b7c86 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 fa2bace56f..efa128ac8e 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 9e58fd1158..99cdb26aae 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 39cc753888..e977cd7707 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 a3c6af7810..b570b9dc94 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 1143cd3f37..9eac00e49d 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 89349ceb4e..092347a6df 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 6b2266fdfd..c52afddd20 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 From 9bd9b2bcbee1c0a0c2fcc2d5e2c61ea272e865c5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 3 Oct 2019 18:32:11 +0200 Subject: [PATCH 3/4] MAINTAINERS: Update my email address I'm not at bootlin anymore, and my mail address doesn't work any longer. Signed-off-by: Maxime Ripard --- MAINTAINERS | 2 +- board/sunxi/MAINTAINERS | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a9a1049eaf..c53656695a 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 c7e9d3eda0..88f13533b8 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 From 5bac9c5307642400abc61a7f9ba76ac06a77fcf8 Mon Sep 17 00:00:00 2001 From: AKASHI Takahiro Date: Thu, 22 Aug 2019 16:47:39 +0900 Subject: [PATCH 4/4] cmd: host: fix seg fault at "host info" With the patch below applied, host_block_dev structure was switched to be placed in platdata rather than priv. The command "host info" must be aligned with this change. Otherwise, we will see "Segmentation Fault." Fixes: 8f994c860d91 ("sandbox: blk: Switch to use platdata_auto_alloc_size for the driver data") Signed-off-by: AKASHI Takahiro Reviewed-by: Bin Meng Tested-by: Bin Meng Reviewed-by: Heinrich Schuchardt --- cmd/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/host.c b/cmd/host.c index f7d3eae5b1..98c4d2a099 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