From e40bd7f09c0f754b0dab83573ef4795137f4857b Mon Sep 17 00:00:00 2001 From: Paul Sherwood Date: Fri, 21 Nov 2014 14:39:27 +0000 Subject: Make u-boot definitions unique --- strata/bsp-jetson.morph | 4 ++-- strata/bsp-jetson/u-boot.morph | 16 ---------------- strata/bsp-jetson/u-boot@jetson.morph | 16 ++++++++++++++++ strata/bsp-wandboard.morph | 4 ++-- strata/bsp-wandboard/u-boot.morph | 11 ----------- strata/bsp-wandboard/u-boot@wandboard.morph | 11 +++++++++++ 6 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 strata/bsp-jetson/u-boot.morph create mode 100644 strata/bsp-jetson/u-boot@jetson.morph delete mode 100644 strata/bsp-wandboard/u-boot.morph create mode 100644 strata/bsp-wandboard/u-boot@wandboard.morph diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index eda1d99b..9d992541 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -18,7 +18,7 @@ chunks: ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph build-depends: [] -- name: u-boot +- name: u-boot@jetson morph: strata/bsp-jetson/u-boot.morph repo: upstream:u-boot ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e @@ -31,7 +31,7 @@ chunks: ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69 unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3 build-depends: - - u-boot + - u-boot@jetson - name: bsp-support morph: strata/bsp-jetson/bsp-support.morph repo: baserock:baserock/bsp-support diff --git a/strata/bsp-jetson/u-boot.morph b/strata/bsp-jetson/u-boot.morph deleted file mode 100644 index 705b3851..00000000 --- a/strata/bsp-jetson/u-boot.morph +++ /dev/null @@ -1,16 +0,0 @@ -name: u-boot -kind: chunk -configure-commands: -- make ARCH=arm jetson-tk1_config -build-commands: -- make ARCH=arm CROSS_COMPILE=/usr/bin/ -- make ARCH=arm CROSS_COMPILE=/usr/bin/ tools -install-commands: -- mkdir -p "$DESTDIR$PREFIX/bin" -- mkdir -p "$DESTDIR/boot" -- install -m 755 u-boot-dtb-tegra.bin "$DESTDIR/boot/u-boot.bin" -- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/." diff --git a/strata/bsp-jetson/u-boot@jetson.morph b/strata/bsp-jetson/u-boot@jetson.morph new file mode 100644 index 00000000..1427e7fd --- /dev/null +++ b/strata/bsp-jetson/u-boot@jetson.morph @@ -0,0 +1,16 @@ +name: u-boot@jetson +kind: chunk +configure-commands: +- make ARCH=arm jetson-tk1_config +build-commands: +- make ARCH=arm CROSS_COMPILE=/usr/bin/ +- make ARCH=arm CROSS_COMPILE=/usr/bin/ tools +install-commands: +- mkdir -p "$DESTDIR$PREFIX/bin" +- mkdir -p "$DESTDIR/boot" +- install -m 755 u-boot-dtb-tegra.bin "$DESTDIR/boot/u-boot.bin" +- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/." +- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/." +- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/." +- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/." +- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/." diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index 4b07b150..0b01610e 100644 --- a/strata/bsp-wandboard.morph +++ b/strata/bsp-wandboard.morph @@ -4,7 +4,7 @@ description: The platform dependent components required to boot an wandboard ARM build-depends: - morph: strata/core.morph chunks: -- name: u-boot +- name: u-boot@wandboard morph: strata/bsp-wandboard/u-boot.morph repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf @@ -16,4 +16,4 @@ chunks: ref: 9573986cf27ff44814f3efb1f1e95638406db456 unpetrify-ref: baserock/morph build-depends: - - u-boot + - u-boot@wandboard diff --git a/strata/bsp-wandboard/u-boot.morph b/strata/bsp-wandboard/u-boot.morph deleted file mode 100644 index 9be30bc7..00000000 --- a/strata/bsp-wandboard/u-boot.morph +++ /dev/null @@ -1,11 +0,0 @@ -name: u-boot -kind: chunk -build-commands: -- make tools -install-commands: -- mkdir -p "$DESTDIR$PREFIX/bin" -- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/." diff --git a/strata/bsp-wandboard/u-boot@wandboard.morph b/strata/bsp-wandboard/u-boot@wandboard.morph new file mode 100644 index 00000000..8a51ee7c --- /dev/null +++ b/strata/bsp-wandboard/u-boot@wandboard.morph @@ -0,0 +1,11 @@ +name: u-boot@wandboard +kind: chunk +build-commands: +- make tools +install-commands: +- mkdir -p "$DESTDIR$PREFIX/bin" +- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/." +- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/." +- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/." +- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/." +- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/." -- cgit v1.2.1