From: Arnd Bergmann Date: Tue, 15 Dec 2015 22:55:32 +0000 (+0100) Subject: Merge branch 'versatile/multiplatform' into next/multiplatform X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7379d96bdabdfb2bf619c174fb6160a9c0a00ca3;p=linux-beck.git Merge branch 'versatile/multiplatform' into next/multiplatform Merge "ARM Versatile multi-platform support" from Rob Herring: Arnd lit a fire under me to dust this off and get it merged. So here it is. The main change from prior version is I merged all the code to a single file. It's a bigger patch than I'd like, but I don't think trying to do it in multiple steps is worth it. This is dependent on some solution for the default platform choice on !MMU builds (allnoconfig) as it can't be Versatile after this series. Arnd has some ideas on how to address that. This is tested under QEMU. Linus previously tested this on actual h/w and had a problem with the display identification which needs investigation or agreement to worry about it if and when someone actually cares. * versatile/multiplatform: ARM: versatile: convert to multi-platform ARM: versatile: merge mach code into a single file ARM: versatile: switch to DT only booting and remove legacy code ARM: versatile: add DT based PCI detection Acked-by: Marc Zyngier --- 7379d96bdabdfb2bf619c174fb6160a9c0a00ca3