Messages in this thread | | | Date | Thu, 22 Aug 2013 00:37:05 +0200 | Subject | Re: [PATCH 05/13] ARM: ux500: Apply a ste-* prefix onto snowball.dts | From | Linus Walleij <> |
| |
On Wed, Aug 21, 2013 at 2:31 AM, Olof Johansson <olof@lixom.net> wrote:
>> diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts >> similarity index 100% >> rename from arch/arm/boot/dts/snowball.dts >> rename to arch/arm/boot/dts/ste-snowball.dts > > Grmbl, grmbl, grmbl. This now breaks any script that knows to use > snowball.dtb. :( > > It's good to get the prefixes added, but it's annoying to have to deal > with both during an overlap period. Maybe generate both dtb filenames > for a while but rename the source?
Hm I had the same problem but changed my Makefile (scripts are too simple for me) like this:
dtb := $(build_dir)/arch/arm/boot/dts/ste-hrefv60plus.dtb +fallbackdtb := $(build_dir)/arch/arm/boot/dts/hrefv60plus.dtb (...) - cat $(dtb) >> $(output_dir)/zImage + if [ -f arch/arm/boot/dts/hrefv60plus.dts ] ; then \ + cat $(fallbackdtb) >> $(output_dir)/zImage ; echo "fallback" ; \ + else \ + cat $(dtb) >> $(output_dir)/zImage ; \ + fi
Yours, Linus Walleij
| |