From: Tom Rini Date: Wed, 3 Apr 2019 14:28:10 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-usb X-Git-Tag: v2019.04~6 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e708abcbba13aea6b57ecb7f0f1042eb29d0dce;hp=2a766db11a7e3129db0c893a43661ed7ee944c55;p=oweals%2Fu-boot.git Merge branch 'master' of git://git.denx.de/u-boot-usb - Documentation fix --- diff --git a/.travis.yml b/.travis.yml index 834502fc8c..eb531f1e5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,13 +163,16 @@ matrix: - name: "buildman arm11 arm7 arm920t arm946es" env: - BUILDMAN="arm11 arm7 arm920t arm946es" - - name: "buildman arm926ejs (non-NXP,siemens,atmel,kirkwood,spear)" + - name: "buildman arm926ejs (non-NXP,siemens,at91,kirkwood,spear)" env: - JOB="arm926ejs" - BUILDMAN="arm926ejs -x freescale,siemens,atmel,kirkwood,spear,omap" - - name: "buildman atmel" + BUILDMAN="arm926ejs -x freescale,siemens,at91,kirkwood,spear,omap" + - name: "buildman at91 (non arm v7)" env: - - BUILDMAN="atmel" + - BUILDMAN="at91 -x armv7" + - name: "buildman at91 (non arm926ejs)" + env: + - BUILDMAN="at91 -x arm926ejs" - name: "buildman boundary engicam toradex" env: - BUILDMAN="boundary engicam toradex" @@ -226,7 +229,7 @@ matrix: - BUILDMAN="sun50i" - name: "buildman catch-all ARM" env: - - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,atmel,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx" + - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,at91,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx" - name: "buildman sandbox x86" env: - BUILDMAN="sandbox x86" diff --git a/Makefile b/Makefile index c1af9307b3..92e04dd689 100644 --- a/Makefile +++ b/Makefile @@ -291,6 +291,9 @@ DARWIN_MINOR_VERSION = $(shell sw_vers -productVersion | cut -f 2 -d '.') os_x_before = $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \ $(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;) +os_x_after = $(shell if [ $(DARWIN_MAJOR_VERSION) -ge $(1) -a \ + $(DARWIN_MINOR_VERSION) -ge $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;) + # Snow Leopards build environment has no longer restrictions as described above HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc") HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp") @@ -300,6 +303,10 @@ HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") # in some host tools which is a problem then ... so disable ASLR for these # tools HOSTLDFLAGS += $(call os_x_before, 10, 7, "", "-Xlinker -no_pie") + +# macOS Mojave (10.14.X) +# Undefined symbols for architecture x86_64: "_PyArg_ParseTuple" +HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "") endif # Decide whether to build built-in, modular, or both. diff --git a/arch/arm/dts/r8a7794-alt-u-boot.dts b/arch/arm/dts/r8a7794-alt-u-boot.dts index 593a418c3b..14cd39297e 100644 --- a/arch/arm/dts/r8a7794-alt-u-boot.dts +++ b/arch/arm/dts/r8a7794-alt-u-boot.dts @@ -8,6 +8,11 @@ #include "r8a7794-alt.dts" #include "r8a7794-u-boot.dtsi" +&i2c7 { + status = "okay"; + clock-frequency = <100000>; +}; + &scif2 { u-boot,dm-pre-reloc; }; diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig index 39d53c185b..957962de20 100644 --- a/board/renesas/alt/Kconfig +++ b/board/renesas/alt/Kconfig @@ -9,13 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "alt" -config R8A7794_ETHERNET_B - bool "Use ethernet B function" - depends on TARGET_ALT - default n - help - ALT board can use default ethernet and etnernet B function. - This config set pin function of ethenet B. You also needt to change - DIP switch of board in order to use this function. - endif diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index b18ab7ce88..0726776a57 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -28,7 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define CLK2MHZ(clk) (clk / 1000 / 1000) void s_init(void) { struct rcar_rwdt *rwdt = (struct rcar_rwdt *)RWDT_BASE; @@ -93,7 +92,7 @@ int dram_init_banksize(void) /* KSZ8041RNLI */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { @@ -108,7 +107,7 @@ int board_phy_config(struct phy_device *phydev) void reset_cpu(ulong addr) { struct udevice *dev; - const u8 pmic_bus = 1; + const u8 pmic_bus = 7; const u8 pmic_addr = 0x58; u8 data; int ret; diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 282381ede5..7c61008739 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -98,7 +98,7 @@ int dram_init_banksize(void) /* KSZ8041RNLI */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index 52f37c970e..d07a7ca2ab 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -100,7 +100,7 @@ int dram_init_banksize(void) /* Koelsch has KSZ8041NL/RNL */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 062e88c198..f062bb0172 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -109,7 +109,7 @@ int dram_init_banksize(void) /* KSZ8041NL/RNL */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index 663b8001ef..2e15a4cbbd 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -98,7 +98,7 @@ int dram_init_banksize(void) /* porter has KSZ8041RNLI */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index 966c0717b2..59ba262ad7 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -93,7 +93,7 @@ int dram_init_banksize(void) /* porter has KSZ8041RNLI */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index 85e30db635..7c515950d6 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -112,7 +112,7 @@ int dram_init_banksize(void) /* Stout has KSZ8041NL/RNL */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/configs/alt_defconfig b/configs/alt_defconfig index c4ece79507..5e5467fe2f 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -57,12 +57,14 @@ CONFIG_CLK_RENESAS=y CONFIG_DM_GPIO=y CONFIG_RCAR_GPIO=y CONFIG_DM_I2C=y +CONFIG_SYS_I2C_RCAR_I2C=y CONFIG_SYS_I2C_RCAR_IIC=y CONFIG_DM_MMC=y CONFIG_SH_MMCIF=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y CONFIG_MTD_DEVICE=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_MTD=y @@ -80,6 +82,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig index 0f738cbb90..080dd19590 100644 --- a/configs/khadas-vim2_defconfig +++ b/configs/khadas-vim2_defconfig @@ -6,8 +6,10 @@ CONFIG_DEBUG_UART_BASE=0xc81004c0 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" khadas-vim2" CONFIG_DEBUG_UART=y +CONFIG_NR_DRAM_BANKS=1 CONFIG_OF_BOARD_SETUP=y CONFIG_CONSOLE_MUX=y +CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_BDI is not set @@ -30,6 +32,7 @@ CONFIG_MTD=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_PHY=y +CONFIG_MESON_GXL_USB_PHY=y CONFIG_PINCTRL=y CONFIG_PINCTRL_MESON_GXL=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 825ee7c3be..32bbf41dd1 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -141,7 +141,7 @@ config PHY_STM32_USBPHYC config MESON_GXL_USB_PHY bool "Amlogic Meson GXL USB PHYs" - depends on PHY && ARCH_MESON && MESON_GXL + depends on PHY && ARCH_MESON && (MESON_GXL || MESON_GXM) imply REGMAP help This is the generic phy driver for the Amlogic Meson GXL diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 9213d33e21..7f72ff2e11 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) -#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ #define CONFIG_ENV_ADDR 0xC0000 diff --git a/lib/bch.c b/lib/bch.c index 20079eb9eb..c4fac77d61 100644 --- a/lib/bch.c +++ b/lib/bch.c @@ -62,6 +62,9 @@ #include #if defined(__FreeBSD__) #include +#elif defined(__APPLE__) +#include +#include #else #include #endif @@ -70,7 +73,11 @@ #include #undef cpu_to_be32 +#if defined(__APPLE__) +#define cpu_to_be32 OSSwapHostToBigInt32 +#else #define cpu_to_be32 htobe32 +#endif #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define kmalloc(size, flags) malloc(size) #define kzalloc(size, flags) calloc(1, size) @@ -116,7 +123,7 @@ struct gf_poly_deg1 { }; #ifdef USE_HOSTCC -#if !defined(__DragonFly__) && !defined(__FreeBSD__) +#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__) static int fls(int x) { int r = 32; diff --git a/tools/Makefile b/tools/Makefile index 081383d7a7..d377d85f74 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -254,7 +254,8 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ -I$(srctree)/tools \ -DUSE_HOSTCC \ -D__KERNEL_STRICT_NAMES \ - -D_GNU_SOURCE + -D_GNU_SOURCE \ + -std=gnu99 __build: $(LOGO-y)