Merge tag 'realview-dts-split' of... (971b4c6e) · Commits · 戴 / test

arch/arm/boot/dts/Makefile

+5 −1

Original line number	Diff line number	Diff line
		@@ -609,9 +609,13 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \
		arm-realview-pb1176.dtb \
		arm-realview-pb11mp.dtb \
		arm-realview-eb.dtb \
		arm-realview-eb-bbrevd.dtb \
		arm-realview-eb-11mp.dtb \
		arm-realview-eb-11mp-revb.dtb \
		arm-realview-eb-11mp-bbrevd.dtb \
		arm-realview-eb-11mp-ctrevb.dtb \
		arm-realview-eb-11mp-bbrevd-ctrevb.dtb \
		arm-realview-eb-a9mp.dtb \
		arm-realview-eb-a9mp-bbrevd.dtb \
		arm-realview-pba8.dtb \
		arm-realview-pbx-a9.dtb
		dtb-$(CONFIG_ARCH_ROCKCHIP) += \

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2016 Linaro Ltd
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
		* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*/

		#include "arm-realview-eb-11mp-ctrevb.dts"
		#include "arm-realview-eb-bbrevd.dtsi"

		/*
		* This is the EB with the new Revision D baseboard with SMSC9118 ethernet and
		* the Rev B core tile.
		*/
		/ {
		model = "ARM RealView Emulation Baseboard Rev D with ARM11MPCore Core Tile Rev B";
		};

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2016 Linaro Ltd
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
		* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*/

		#include "arm-realview-eb-11mp.dts"
		#include "arm-realview-eb-bbrevd.dtsi"

		/ {
		model = "ARM RealView Emulation Baseboard Rev D with ARM11MPCore Rev C Core Tile";
		};

+0 −0

File moved.

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		#include "arm-realview-eb-mp.dtsi"

		/ {
		model = "ARM RealView Emulation Baseboard with ARM11MPCore Rev C";
		model = "ARM RealView Emulation Baseboard with ARM11MPCore Rev C Core Tile";
		arm,hbi = <0x146>;

		/*