[U-Boot] [PATCHv3 1/3] at91: Minor tweaks to SPL logic for space savings on smartweb
- spl_board_init is empty on smartweb so drop that function - When CONFIG_AT91SAM9_WATCHDOG is set we do not disable the watchdog in SPL and instead let full U-Boot handle it. Instead of an empty function just do not call a function.
Signed-off-by: Tom Rini trini@konsulko.com --- With gcc-7.2 smartweb is 16bytes too large. These changes bring us just back under. --- arch/arm/Kconfig | 2 +- arch/arm/mach-at91/spl.c | 4 +--- arch/arm/mach-at91/spl_at91.c | 2 ++ arch/arm/mach-at91/spl_atmel.c | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2bbb86c462dd..a5420112f39c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -393,7 +393,7 @@ choice
config ARCH_AT91 bool "Atmel AT91" - select SPL_BOARD_INIT if SPL + select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB
config TARGET_EDB93XX bool "Support edb93xx" diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index 7cba3825e7f4..8bfb2a452b5e 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -11,9 +11,7 @@ #include <asm/arch/clk.h> #include <spl.h>
-#if defined(CONFIG_AT91SAM9_WATCHDOG) -void at91_disable_wdt(void) { } -#else +#if !defined(CONFIG_AT91SAM9_WATCHDOG) void at91_disable_wdt(void) { struct at91_wdt *wdt = (struct at91_wdt *)ATMEL_BASE_WDT; diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c index d701c3586d38..8c368042a6b2 100644 --- a/arch/arm/mach-at91/spl_at91.c +++ b/arch/arm/mach-at91/spl_at91.c @@ -76,7 +76,9 @@ void __weak spl_board_init(void) void board_init_f(ulong dummy) { lowlevel_clock_init(); +#if !defined(CONFIG_AT91SAM9_WATCHDOG) at91_disable_wdt(); +#endif
/* * At this stage the main oscillator is supposed to be enabled diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index 11db1e5f8cff..597ff8c03673 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -98,8 +98,10 @@ void board_init_f(ulong dummy) configure_2nd_sram_as_l2_cache(); #endif
+#if !defined(CONFIG_AT91SAM9_WATCHDOG) /* disable watchdog */ at91_disable_wdt(); +#endif
/* PMC configuration */ at91_pmc_init();
From: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Add support for gcc versions 7.3.0, 6.4.0 and 4.9.4.
Also use a regex for matching the tarball names. Some gcc versions use '-ARCH-' instead of '_ARCH-'.
As part of this, we switch TravisCI to also using these toolchains for all platforms.
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com Signed-off-by: Tom Rini trini@konsulko.com --- Changes in v2: - Change to only 7.3.0 / 6.4.0 / 4.9.4 for gcc versions. Update .travis.yml for x86_64 toolchain and fetch all toolchains. - Fold in the old patch I had to expand and update SH builds as we cannot build without those changes. --- .travis.yml | 38 ++++++++++++++++++++++++++------------ tools/buildman/toolchain.py | 6 +++--- 2 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/.travis.yml b/.travis.yml index 57f38e11698b..ca8cdf5dff23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,6 @@ addons: - python-virtualenv - swig - libpython-dev - - gcc-powerpc-linux-gnu - iasl - grub-efi-ia32-bin - rpm2cpio @@ -29,6 +28,11 @@ addons: - device-tree-compiler - lzop
+before_install: + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + - sudo apt-get update -q + - sudo apt-get install libisl15 -y + install: # Clone uboot-test-hooks - git clone --depth=1 git://github.com/swarren/uboot-test-hooks.git /tmp/uboot-test-hooks @@ -36,10 +40,8 @@ install: - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` # prepare buildman environment - echo -e "[toolchain]\nroot = /usr" > ~/.buildman - - echo -e "aarch64 = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu" >> ~/.buildman - - echo -e "arm = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf" >> ~/.buildman - echo -e "arc = /tmp/arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman - - echo -e "\n[toolchain-alias]\nsh = sh4\nopenrisc = or32" >> ~/.buildman + - echo -e "\n[toolchain-alias]\nsh = sh2\nx86 = x86_64\nsandbox = x86_64\n" >> ~/.buildman - cat ~/.buildman - virtualenv /tmp/venv - . /tmp/venv/bin/activate @@ -64,10 +66,10 @@ before_script: - if [[ "${TOOLCHAIN}" == *microblaze* ]]; then ./tools/buildman/buildman --fetch-arch microblaze ; fi - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi - if [[ "${TOOLCHAIN}" == *or32* ]]; then ./tools/buildman/buildman --fetch-arch or32 ; fi - - if [[ "${TOOLCHAIN}" == *sh4* ]]; then ./tools/buildman/buildman --fetch-arch sh4 ; fi + - if [[ "${TOOLCHAIN}" == *sh* ]]; then ./tools/buildman/buildman --fetch-arch sh2 ; fi - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then ./tools/buildman/buildman --fetch-arch x86_64; - echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; + echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-7.3.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; fi - if [[ "${TOOLCHAIN}" == arc ]]; then wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/d... && @@ -80,11 +82,10 @@ before_script: fi # If TOOLCHAIN is unset, we're on some flavour of ARM. - if [[ "${TOOLCHAIN}" == "" ]]; then - wget http://releases.linaro.org/components/toolchain/binaries/6.3-2017.02/aarch64... && - wget http://releases.linaro.org/components/toolchain/binaries/6.3-2017.02/arm-lin... && - tar -C /tmp -xf gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu.tar.xz && - tar -C /tmp -xf gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf.tar.xz; + ./tools/buildman/buildman --fetch-arch arm && + ./tools/buildman/buildman --fetch-arch aarch64; fi + - if [[ "${TOOLCHAIN}" == "powerpc" ]]; then ./tools/buildman/buildman --fetch-arch powerpc; fi - if [[ "${TOOLCHAIN}" == "riscv" ]]; then wget https://github.com/PkmX/riscv-prebuilt-toolchains/releases/download/20180111... && tar -C /tmp -xf riscv32-unknown-elf-toolchain.tar.gz && @@ -227,26 +228,37 @@ matrix: TOOLCHAIN="mips" - env: - BUILDMAN="mpc83xx" + TOOLCHAIN="powerpc" - env: - BUILDMAN="mpc85xx -x freescale" + TOOLCHAIN="powerpc" - env: - BUILDMAN="mpc85xx -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x sbc8548 -x bsc91*" + TOOLCHAIN="powerpc" - env: - BUILDMAN="t208xrdb" + TOOLCHAIN="powerpc" - env: - BUILDMAN="t4qds" + TOOLCHAIN="powerpc" - env: - BUILDMAN="t102*" + TOOLCHAIN="powerpc" - env: - BUILDMAN="p1_p2_rdb_pc" + TOOLCHAIN="powerpc" - env: - BUILDMAN="p1010rdb" + TOOLCHAIN="powerpc" - env: - BUILDMAN="corenet_ds b4860qds sbc8548 bsc91*" + TOOLCHAIN="powerpc" - env: - BUILDMAN="mpc86xx" + TOOLCHAIN="powerpc" - env: - BUILDMAN="mpc8xx" + TOOLCHAIN="powerpc" - env: - BUILDMAN="siemens" - env: @@ -269,8 +281,9 @@ matrix: - env: - BUILDMAN="rockchip" - env: - - BUILDMAN="sh4" - TOOLCHAIN="sh4" + - JOB="sh" + BUILDMAN="sh -x arm" + TOOLCHAIN="sh" - env: - JOB="Xilinx (ARM)" BUILDMAN="xilinx -x microblaze" @@ -376,6 +389,7 @@ matrix: TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="ppc-softmmu" BUILDMAN="^qemu-ppce500$" + TOOLCHAIN="powerpc" - env: - TEST_PY_BD="qemu-x86" TEST_PY_TEST_SPEC="not sleep" diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index fb3157b2ea8d..4b35f400e97d 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -32,7 +32,7 @@ class MyHTMLParser(HTMLParser): HTMLParser.__init__(self) self.arch_link = None self.links = [] - self._match = '_%s-' % arch + self.re_arch = re.compile('[-_]%s-' % arch)
def handle_starttag(self, tag, attrs): if tag == 'a': @@ -40,7 +40,7 @@ class MyHTMLParser(HTMLParser): if tag == 'href': if value and value.endswith('.xz'): self.links.append(value) - if self._match in value: + if self.re_arch.search(value): self.arch_link = value
@@ -430,7 +430,7 @@ class Toolchains: """ arch = command.OutputOneLine('uname', '-m') base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['4.9.0', '4.6.3', '4.6.2', '4.5.1', '4.2.4'] + versions = ['7.3.0', '6.4.0', '4.9.4'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version)
On Thu, May 10, 2018 at 07:15:53AM -0400, Tom Rini wrote:
From: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Add support for gcc versions 7.3.0, 6.4.0 and 4.9.4.
Also use a regex for matching the tarball names. Some gcc versions use '-ARCH-' instead of '_ARCH-'.
As part of this, we switch TravisCI to also using these toolchains for all platforms.
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
- Xilinx aarch64 is caught in the general xilinx arm job, exclude from the general aarch64 job. - Give the generic aarch64 job a better name - Re-sort the PowerPC jobs so that we can complete them a bit quicker.
Signed-off-by: Tom Rini trini@konsulko.com --- Changes in v3: - Collapse a few more vendor jobs into single entries - Build (and exclude) omap as a whole. --- .travis.yml | 57 ++++++++++++++------------------------------------------- 1 file changed, 14 insertions(+), 43 deletions(-)
diff --git a/.travis.yml b/.travis.yml index ca8cdf5dff23..937f028d6da8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ install: # prepare buildman environment - echo -e "[toolchain]\nroot = /usr" > ~/.buildman - echo -e "arc = /tmp/arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman - - echo -e "\n[toolchain-alias]\nsh = sh2\nx86 = x86_64\nsandbox = x86_64\n" >> ~/.buildman + - echo -e "\n[toolchain-alias]\nsh = sh2\n" >> ~/.buildman - cat ~/.buildman - virtualenv /tmp/venv - . /tmp/venv/bin/activate @@ -150,26 +150,16 @@ matrix: - BUILDMAN="arc" TOOLCHAIN="arc" - env: - - BUILDMAN="arm11" - - env: - - BUILDMAN="arm7" - - env: - - BUILDMAN="arm920t" + - BUILDMAN="arm11 arm7 arm920t arm946es" - env: - JOB="arm926ejs" BUILDMAN="arm926ejs -x mx,siemens,atmel" - env: - - BUILDMAN="arm946es" - - env: - BUILDMAN="atmel" - env: - BUILDMAN="aries" - env: - - JOB="Boundary Devices" - BUILDMAN="boundary" - - env: - - JOB="engicam" - BUILDMAN="engicam" + BUILDMAN="boundary engicam toradex" - env: - JOB="Freescale ARM32" BUILDMAN="freescale -x powerpc,m68k,aarch64" @@ -185,9 +175,7 @@ matrix: - env: - BUILDMAN="k2" - env: - - BUILDMAN="samsung" - - env: - - BUILDMAN="socfpga" + - BUILDMAN="samsung socfpga" - env: - BUILDMAN="sun4i" - env: @@ -204,13 +192,11 @@ matrix: - BUILDMAN="sun50i" - env: - JOB="Catch-all ARM" - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,atmel,aries,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap3,omap4,omap5,pxa,rockchip,toradex,socfpga,k2,xilinx" + BUILDMAN="arm -x arm11,arm7,arm9,aarch64,atmel,aries,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx" - env: - BUILDMAN="sandbox x86" TOOLCHAIN="x86_64" - env: - - BUILDMAN="toradex" - - env: - BUILDMAN="kirkwood" - env: - BUILDMAN="mvebu" @@ -227,19 +213,17 @@ matrix: - BUILDMAN="mips" TOOLCHAIN="mips" - env: - - BUILDMAN="mpc83xx" - TOOLCHAIN="powerpc" - - env: - - BUILDMAN="mpc85xx -x freescale" + - JOB="Non-Freescale PowerPC" + BUILDMAN="powerpc -x freescale" TOOLCHAIN="powerpc" - env: - - BUILDMAN="mpc85xx -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x sbc8548 -x bsc91*" + - BUILDMAN="mpc85xx&freescale -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x bsc91*" TOOLCHAIN="powerpc" - env: - - BUILDMAN="t208xrdb" + - BUILDMAN="t208xrdb corenet_ds" TOOLCHAIN="powerpc" - env: - - BUILDMAN="t4qds" + - BUILDMAN="t4qds b4860qds mpc83xx&freescale mpc86xx&freescale" TOOLCHAIN="powerpc" - env: - BUILDMAN="t102*" @@ -248,16 +232,7 @@ matrix: - BUILDMAN="p1_p2_rdb_pc" TOOLCHAIN="powerpc" - env: - - BUILDMAN="p1010rdb" - TOOLCHAIN="powerpc" - - env: - - BUILDMAN="corenet_ds b4860qds sbc8548 bsc91*" - TOOLCHAIN="powerpc" - - env: - - BUILDMAN="mpc86xx" - TOOLCHAIN="powerpc" - - env: - - BUILDMAN="mpc8xx" + - BUILDMAN="p1010rdb bsc91" TOOLCHAIN="powerpc" - env: - BUILDMAN="siemens" @@ -268,16 +243,12 @@ matrix: - JOB="am33xx" BUILDMAN="am33xx -x siemens" - env: - - BUILDMAN="omap3" - - env: - - BUILDMAN="omap4" - - env: - - BUILDMAN="omap5" + - BUILDMAN="omap" - env: - BUILDMAN="uniphier" - env: - - JOB="aarch64" - BUILDMAN="aarch64 -x tegra,freescale,mvebu,uniphier,sunxi,samsung,rockchip" + - JOB="Catch-all AArch64" + BUILDMAN="aarch64 -x tegra,freescale,mvebu,uniphier,sunxi,samsung,rockchip,xilinx" - env: - BUILDMAN="rockchip" - env:
On Thu, May 10, 2018 at 07:15:54AM -0400, Tom Rini wrote:
- Xilinx aarch64 is caught in the general xilinx arm job, exclude from the general aarch64 job.
- Give the generic aarch64 job a better name
- Re-sort the PowerPC jobs so that we can complete them a bit quicker.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
On Thu, May 10, 2018 at 07:15:52AM -0400, Tom Rini wrote:
- spl_board_init is empty on smartweb so drop that function
- When CONFIG_AT91SAM9_WATCHDOG is set we do not disable the watchdog in SPL and instead let full U-Boot handle it. Instead of an empty function just do not call a function.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (1)
-
Tom Rini