From d4b2bc889ee2c37f9f76914cdba598621ff64c03 Mon Sep 17 00:00:00 2001 From: Edward Cragg Date: Fri, 6 Nov 2015 17:23:55 +0000 Subject: SoCFPGA: Amendments to SoCFPGA system definitions Remove a duplicated stratum, and correct the repo url for bsp-support. These Altera SoCFPGA definitions will now build correctly with modern morph. Change-Id: I614c1e21ead2d4d66607695b8482eecefc44cd7c --- strata/bsp-armv7l-altera-socfpga-devkit.morph | 18 +++++------------- .../bsp-armv7l-altera-socfpga-devkit/bsp-support.morph | 17 ----------------- .../bsp-support@socfpga-devkit.morph | 17 +++++++++++++++++ .../build-system-armv7l-altera-socfpga-devkit.morph | 4 ++-- .../devel-system-armv7l-altera-socfpga-devkit.morph | 4 ++-- 5 files changed, 26 insertions(+), 34 deletions(-) delete mode 100644 strata/bsp-armv7l-altera-socfpga-devkit/bsp-support.morph create mode 100644 strata/bsp-armv7l-altera-socfpga-devkit/bsp-support@socfpga-devkit.morph diff --git a/strata/bsp-armv7l-altera-socfpga-devkit.morph b/strata/bsp-armv7l-altera-socfpga-devkit.morph index 8a81c96e..403e04e1 100644 --- a/strata/bsp-armv7l-altera-socfpga-devkit.morph +++ b/strata/bsp-armv7l-altera-socfpga-devkit.morph @@ -5,29 +5,21 @@ description: | HPS core on an Altera SoCFPGA development kit. build-depends: - morph: strata/coreutils-common.morph +- morph: strata/tools.morph chunks: -- name: device-tree-compiler - morph: strata/bsp-armv7l-altera-socfpga-devkit/device-tree-compiler.morph - repo: upstream:device-tree-compiler - ref: 302fca9f4c283e1994cf0a5a9ce1cf43ca15e6d2 - unpetrify-ref: v1.4.1 - name: u-boot-tools@socfpga-devkit morph: strata/bsp-armv7l-altera-socfpga-devkit/u-boot-tools@socfpga-devkit.morph repo: upstream:u-boot ref: 905e8f9e53766e606bd4a0ed46d804889e613f32 unpetrify-ref: v2015.07-rc1 - build-depends: - - device-tree-compiler - name: u-boot@socfpga-devkit morph: strata/bsp-armv7l-altera-socfpga-devkit/u-boot@socfpga-devkit.morph repo: upstream:u-boot-socfpga ref: 32c1d91bc0d10beca54c2dfc5b475d4ffeffc15a unpetrify-ref: socfpga_v2013.01.01 - build-depends: - - device-tree-compiler -- name: bsp-support - morph: strata/bsp-armv7l-altera-socfpga-devkit/bsp-support.morph - repo: upstream:bsp-support +- name: bsp-support@socfpga-devkit + morph: strata/bsp-armv7l-altera-socfpga-devkit/bsp-support@socfpga-devkit.morph + repo: baserock:baserock/bsp-support ref: 95e6be2188ad9dfd13cb8887cdc698519831871d unpetrify-ref: master build-depends: @@ -38,7 +30,7 @@ chunks: ref: 32c1d91bc0d10beca54c2dfc5b475d4ffeffc15a unpetrify-ref: socfpga_v2013.01.01 build-depends: - - bsp-support + - bsp-support@socfpga-devkit - u-boot-tools@socfpga-devkit - name: linux-armv7l-altera-socfpga-devkit morph: strata/bsp-armv7l-altera-socfpga-devkit/linux-armv7l-altera-socfpga-devkit.morph diff --git a/strata/bsp-armv7l-altera-socfpga-devkit/bsp-support.morph b/strata/bsp-armv7l-altera-socfpga-devkit/bsp-support.morph deleted file mode 100644 index c7f7ed0a..00000000 --- a/strata/bsp-armv7l-altera-socfpga-devkit/bsp-support.morph +++ /dev/null @@ -1,17 +0,0 @@ -name: bsp-support -kind: chunk -build-commands: -# Modify auto-generated source files: -- mv altera-socfpga/* . -- for file in patches/*.diff; do patch -p 1 < "$file"; done -- sed -i 's/^PRELOADER_SETTINGS_DIR := .*$/PRELOADER_SETTINGS_DIR := .\/hps_hps_0/' hardware-handoff/spl_bsp/Makefile -- sed -i 's/^CROSS_COMPILE := .*$/CROSS_COMPILE := \/usr\/bin\//' hardware-handoff/spl_bsp/Makefile -- mkenvimage -s 4096 -o socfpga-devkit-env.img socfpga-devkit-env.txt -- dtc -f -I dts -O dtb dts-generated/socfpga-devkit.dts > socfpga-devkit.dtb -install-commands: -- mkdir -p "$DESTDIR/boot" -- install -m 755 socfpga-devkit-env.img "$DESTDIR/boot" -- install -m 755 socfpga-devkit.dtb "$DESTDIR/boot" -# These files are required later, to be built against U-Boot: -- mkdir -p "$DESTDIR/tmp/preloader" -- cp -R ./hardware-handoff/* "$DESTDIR/tmp/preloader" diff --git a/strata/bsp-armv7l-altera-socfpga-devkit/bsp-support@socfpga-devkit.morph b/strata/bsp-armv7l-altera-socfpga-devkit/bsp-support@socfpga-devkit.morph new file mode 100644 index 00000000..2e206b4e --- /dev/null +++ b/strata/bsp-armv7l-altera-socfpga-devkit/bsp-support@socfpga-devkit.morph @@ -0,0 +1,17 @@ +name: bsp-support@socfpga-devkit +kind: chunk +build-commands: +# Modify auto-generated source files: +- mv altera-socfpga/* . +- for file in patches/*.diff; do patch -p 1 < "$file"; done +- sed -i 's/^PRELOADER_SETTINGS_DIR := .*$/PRELOADER_SETTINGS_DIR := .\/hps_hps_0/' hardware-handoff/spl_bsp/Makefile +- sed -i 's/^CROSS_COMPILE := .*$/CROSS_COMPILE := \/usr\/bin\//' hardware-handoff/spl_bsp/Makefile +- mkenvimage -s 4096 -o socfpga-devkit-env.img socfpga-devkit-env.txt +- dtc -f -I dts -O dtb dts-generated/socfpga-devkit.dts > socfpga-devkit.dtb +install-commands: +- mkdir -p "$DESTDIR/boot" +- install -m 755 socfpga-devkit-env.img "$DESTDIR/boot" +- install -m 755 socfpga-devkit.dtb "$DESTDIR/boot" +# These files are required later, to be built against U-Boot: +- mkdir -p "$DESTDIR/tmp/preloader" +- cp -R ./hardware-handoff/* "$DESTDIR/tmp/preloader" diff --git a/systems/build-system-armv7l-altera-socfpga-devkit.morph b/systems/build-system-armv7l-altera-socfpga-devkit.morph index ff93569f..813392cb 100644 --- a/systems/build-system-armv7l-altera-socfpga-devkit.morph +++ b/systems/build-system-armv7l-altera-socfpga-devkit.morph @@ -13,8 +13,8 @@ strata: morph: strata/foundation.morph - name: bsp-armv7l-altera-socfpga-devkit morph: strata/bsp-armv7l-altera-socfpga-devkit.morph -- name: python-core - morph: strata/python-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: tools morph: strata/tools.morph - name: python-cliapp diff --git a/systems/devel-system-armv7l-altera-socfpga-devkit.morph b/systems/devel-system-armv7l-altera-socfpga-devkit.morph index e467d862..ab8f6bf1 100644 --- a/systems/devel-system-armv7l-altera-socfpga-devkit.morph +++ b/systems/devel-system-armv7l-altera-socfpga-devkit.morph @@ -35,8 +35,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common -- cgit v1.2.1