mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-06 03:06:16 +09:00
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.
This commit is contained in:
commit
879396a240
|
@ -59,7 +59,7 @@ stages:
|
||||||
fi;
|
fi;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
build all 32bit ARM plaforms:
|
build all 32bit ARM platforms:
|
||||||
tags: [ 'all' ]
|
tags: [ 'all' ]
|
||||||
stage: world build
|
stage: world build
|
||||||
script:
|
script:
|
||||||
|
@ -70,7 +70,7 @@ build all 32bit ARM plaforms:
|
||||||
exit $ret;
|
exit $ret;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
build all 64bit ARM plaforms:
|
build all 64bit ARM platforms:
|
||||||
tags: [ 'all' ]
|
tags: [ 'all' ]
|
||||||
stage: world build
|
stage: world build
|
||||||
script:
|
script:
|
||||||
|
@ -84,7 +84,7 @@ build all 64bit ARM plaforms:
|
||||||
exit $ret;
|
exit $ret;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
build all PowerPC plaforms:
|
build all PowerPC platforms:
|
||||||
tags: [ 'all' ]
|
tags: [ 'all' ]
|
||||||
stage: world build
|
stage: world build
|
||||||
script:
|
script:
|
||||||
|
@ -95,7 +95,7 @@ build all PowerPC plaforms:
|
||||||
exit $ret;
|
exit $ret;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
build all other plaforms:
|
build all other platforms:
|
||||||
tags: [ 'all' ]
|
tags: [ 'all' ]
|
||||||
stage: world build
|
stage: world build
|
||||||
script:
|
script:
|
||||||
|
|
|
@ -366,7 +366,7 @@ F: arch/arm/include/asm/arch-stv0991/
|
||||||
|
|
||||||
ARM SUNXI
|
ARM SUNXI
|
||||||
M: Jagan Teki <jagan@amarulasolutions.com>
|
M: Jagan Teki <jagan@amarulasolutions.com>
|
||||||
M: Maxime Ripard <maxime.ripard@bootlin.com>
|
M: Maxime Ripard <mripard@kernel.org>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git
|
T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git
|
||||||
F: arch/arm/cpu/armv7/sunxi/
|
F: arch/arm/cpu/armv7/sunxi/
|
||||||
|
|
|
@ -151,7 +151,7 @@ F: configs/Bananapi_M2_Ultra_defconfig
|
||||||
F: arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
|
F: arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
|
||||||
|
|
||||||
BANANAPI M2 MAGIC BOARD
|
BANANAPI M2 MAGIC BOARD
|
||||||
M: Maxime Ripard <maxime.ripard@bootlin.com>
|
M: Maxime Ripard <mripard@kernel.org>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: configs/Bananapi_m2m_defconfig
|
F: configs/Bananapi_m2m_defconfig
|
||||||
F: arch/arm/dts/sun8i-r16-bananapi-m2m.dts
|
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
|
F: arch/arm/dts/sun8i-h3-beelink-x2.dts
|
||||||
|
|
||||||
COLOMBUS BOARD
|
COLOMBUS BOARD
|
||||||
M: Maxime Ripard <maxime.ripard@bootlin.com>
|
M: Maxime Ripard <mripard@kernel.org>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: configs/Colombus_defconfig
|
F: configs/Colombus_defconfig
|
||||||
|
|
||||||
|
@ -465,7 +465,7 @@ F: configs/Sunchip_CX-A99_defconfig
|
||||||
W: https://linux-sunxi.org/Sunchip_CX-A99
|
W: https://linux-sunxi.org/Sunchip_CX-A99
|
||||||
|
|
||||||
TBS A711 BOARD
|
TBS A711 BOARD
|
||||||
M: Maxime Ripard <maxime.ripard@bootlin.com>
|
M: Maxime Ripard <mripard@kernel.org>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: configs/tbs_a711_defconfig
|
F: configs/tbs_a711_defconfig
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,7 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
struct host_block_dev *host_dev;
|
struct host_block_dev *host_dev;
|
||||||
|
|
||||||
#ifdef CONFIG_BLK
|
#ifdef CONFIG_BLK
|
||||||
host_dev = dev_get_priv(blk_dev->bdev);
|
host_dev = dev_get_platdata(blk_dev->bdev);
|
||||||
#else
|
#else
|
||||||
host_dev = blk_dev->priv;
|
host_dev = blk_dev->priv;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -46,3 +46,4 @@ CONFIG_SPI=y
|
||||||
CONFIG_TIMER=y
|
CONFIG_TIMER=y
|
||||||
CONFIG_SPL_TIMER=y
|
CONFIG_SPL_TIMER=y
|
||||||
CONFIG_DESIGNWARE_APB_TIMER=y
|
CONFIG_DESIGNWARE_APB_TIMER=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -65,3 +65,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -62,3 +62,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -61,3 +61,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -57,3 +57,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -47,4 +47,5 @@ CONFIG_SPI=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_DM_USB=y
|
CONFIG_DM_USB=y
|
||||||
CONFIG_USB_DWC2=y
|
CONFIG_USB_DWC2=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
# CONFIG_EFI_LOADER is not set
|
# CONFIG_EFI_LOADER is not set
|
||||||
|
|
|
@ -51,3 +51,4 @@ CONFIG_MII=y
|
||||||
CONFIG_DM_RESET=y
|
CONFIG_DM_RESET=y
|
||||||
CONFIG_SPI=y
|
CONFIG_SPI=y
|
||||||
CONFIG_CADENCE_QSPI=y
|
CONFIG_CADENCE_QSPI=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -58,3 +58,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -68,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -57,3 +57,4 @@ CONFIG_MII=y
|
||||||
CONFIG_DM_RESET=y
|
CONFIG_DM_RESET=y
|
||||||
CONFIG_SPI=y
|
CONFIG_SPI=y
|
||||||
CONFIG_CADENCE_QSPI=y
|
CONFIG_CADENCE_QSPI=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
|
@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
||||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
||||||
CONFIG_USB_GADGET_DWC2_OTG=y
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
||||||
CONFIG_USB_GADGET_DOWNLOAD=y
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
||||||
|
# CONFIG_SPL_WDT is not set
|
||||||
|
|
Loading…
Reference in New Issue
Block a user