diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c index 350e3ff..a742bbf 100644 --- a/arch/arm/boards/beaglebone/lowlevel.c +++ b/arch/arm/boards/beaglebone/lowlevel.c @@ -104,6 +104,7 @@ }; extern char __dtb_am335x_boneblack_start[]; +extern char __dtb_am335x_bone_common_start[]; extern char __dtb_am335x_bone_start[]; /** @@ -120,13 +121,12 @@ uint32_t sdram_size; void *fdt; - if (is_beaglebone_black()) { + fdt = __dtb_am335x_bone_common_start; + + if (is_beaglebone_black()) sdram_size = SZ_512M; - fdt = __dtb_am335x_boneblack_start; - } else { + else sdram_size = SZ_256M; - fdt = __dtb_am335x_bone_start; - } /* WDT1 is already running when the bootloader gets control * Disable it to avoid "random" resets diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index ef65302..bb6c622 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1,6 +1,7 @@ dtb-$(CONFIG_ARCH_AM33XX) += \ am335x-bone.dtb \ am335x-boneblack.dtb \ + am335x-bone-common.dtb \ am335x-phytec-phycore.dtb dtb-$(CONFIG_ARCH_IMX25) += imx25-karo-tx25.dtb dtb-$(CONFIG_ARCH_IMX27) += imx27-phytec-phycard-s-rdk-bb.dtb @@ -43,7 +44,7 @@ BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_NAME)) obj-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o -pbl-$(CONFIG_MACH_BEAGLEBONE) += am335x-bone.dtb.o am335x-boneblack.dtb.o +pbl-$(CONFIG_MACH_BEAGLEBONE) += am335x-bone.dtb.o am335x-boneblack.dtb.o am335x-bone-common.dtb.o pbl-$(CONFIG_MACH_EFIKA_MX_SMARTBOOK) += imx51-genesi-efika-sb.dtb.o pbl-$(CONFIG_MACH_EMBEST_RIOTBOARD) += imx6s-riotboard.dtb.o pbl-$(CONFIG_MACH_FREESCALE_MX51_PDK) += imx51-babbage.dtb.o diff --git a/arch/arm/dts/am335x-bone-common.dts b/arch/arm/dts/am335x-bone-common.dts new file mode 100644 index 0000000..bbc5561 --- /dev/null +++ b/arch/arm/dts/am335x-bone-common.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "am33xx.dtsi" +#include "am335x-bone-common.dtsi" + +/ { + model = "TI AM335x BeagleBone"; + compatible = "ti,am335x-bone", "ti,am33xx"; +};