From 38b7d0dbb9d1902be4e27d0fadc1b829afdd5c33 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 16 Jun 2017 08:57:02 +0200
Subject: platform-v7a: beaglebone: add board support

Re-add support for beaglebone-white and beaglebone-black, with the
configs+rules for image creation and bootspec entries.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
[improve commit description]
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 .../platform-v7a/config/images/beaglebone.config   | 29 ++++++++++++++++++
 configs/platform-v7a/platforms/image-beaglebone.in | 13 +++++++++
 .../projectroot/loader/entries/boneblack.conf      |  3 +-
 .../projectroot/loader/entries/bonewhite.conf      |  3 +-
 configs/platform-v7a/rules/image-beaglebone.make   | 34 ++++++++++++++++++++++
 5 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 configs/platform-v7a/config/images/beaglebone.config
 create mode 100644 configs/platform-v7a/platforms/image-beaglebone.in
 create mode 100644 configs/platform-v7a/rules/image-beaglebone.make

diff --git a/configs/platform-v7a/config/images/beaglebone.config b/configs/platform-v7a/config/images/beaglebone.config
new file mode 100644
index 0000000..67d32ff
--- /dev/null
+++ b/configs/platform-v7a/config/images/beaglebone.config
@@ -0,0 +1,29 @@
+image beaglebone-boot.vfat {
+	vfat {
+		file MLO { image = "barebox-am33xx-beaglebone-mlo.img"}
+		file barebox.bin { image = "barebox-am33xx-beaglebone.img" }
+	}
+	size = 32M
+}
+
+image @IMAGE@ {
+	hdimage {
+		align = 1M
+		disk-signature = 0xabe26147
+	}
+	partition boot {
+		image = beaglebone-boot.vfat
+		size = 32M
+		partition-type = 0xc
+		bootable = true
+	}
+	partition root-A {
+		image = root.ext2
+		partition-type = 0x83
+		size = 512M
+	}
+	partition data {
+		partition-type = 0x83
+		size = 512M
+	}
+}
diff --git a/configs/platform-v7a/platforms/image-beaglebone.in b/configs/platform-v7a/platforms/image-beaglebone.in
new file mode 100644
index 0000000..b9dd8be
--- /dev/null
+++ b/configs/platform-v7a/platforms/image-beaglebone.in
@@ -0,0 +1,13 @@
+## SECTION=image
+
+config IMAGE_BEAGLEBONE
+	tristate
+	select HOST_GENIMAGE
+	select HOST_DOSFSTOOLS
+	select HOST_MTOOLS
+	select IMAGE_ROOT_EXT
+	select BAREBOX_AM335X
+	select BAREBOX_AM335X_MLO
+	prompt "Generate images/beaglebone.hdimg"
+	help
+	  FIXME
diff --git a/configs/platform-v7a/projectroot/loader/entries/boneblack.conf b/configs/platform-v7a/projectroot/loader/entries/boneblack.conf
index 028184f..faa52b5 100644
--- a/configs/platform-v7a/projectroot/loader/entries/boneblack.conf
+++ b/configs/platform-v7a/projectroot/loader/entries/boneblack.conf
@@ -1,5 +1,6 @@
 title		BeagleBone Black - Pengutronix-DistroKit
 version		4.6
-options		root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rw
+options		rootwait rw
 linux		/boot/zImage
 devicetree	/boot/am335x-boneblack.dtb
+linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/bonewhite.conf b/configs/platform-v7a/projectroot/loader/entries/bonewhite.conf
index 727a263..3e13459 100644
--- a/configs/platform-v7a/projectroot/loader/entries/bonewhite.conf
+++ b/configs/platform-v7a/projectroot/loader/entries/bonewhite.conf
@@ -1,5 +1,6 @@
 title		BeagleBone White - Pengutronix-DistroKit
 version		4.6
-options		root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rw
+options		rootwait rw
 linux		/boot/zImage
 devicetree	/boot/am335x-bone.dtb
+linux-appendroot true
diff --git a/configs/platform-v7a/rules/image-beaglebone.make b/configs/platform-v7a/rules/image-beaglebone.make
new file mode 100644
index 0000000..003bdda
--- /dev/null
+++ b/configs/platform-v7a/rules/image-beaglebone.make
@@ -0,0 +1,34 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+IMAGE_PACKAGES-$(PTXCONF_IMAGE_BEAGLEBONE) += image-beaglebone
+
+#
+# Paths and names
+#
+IMAGE_BEAGLEBONE		:= image-beaglebone
+IMAGE_BEAGLEBONE_DIR	:= $(BUILDDIR)/$(IMAGE_BEAGLEBONE)
+IMAGE_BEAGLEBONE_IMAGE	:= $(IMAGEDIR)/beaglebone.hdimg
+IMAGE_BEAGLEBONE_FILES	:= $(IMAGEDIR)/root.tgz
+IMAGE_BEAGLEBONE_CONFIG	:= beaglebone.config
+
+# ----------------------------------------------------------------------------
+# Image
+# ----------------------------------------------------------------------------
+
+$(IMAGE_BEAGLEBONE_IMAGE):
+	@$(call targetinfo)
+	@$(call image/genimage, IMAGE_BEAGLEBONE)
+	@$(call finish)
+
+# vim: syntax=make
-- 
cgit v1.2.3