From c3a46c606d40ed639e706aef9979d6f4d6d2a0c2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Wed, 14 Sep 2016 18:22:41 +0200
Subject: beaglebone-black: some fixes, no serial output yet

---
 target/arm/Makefile                  | 14 ++++++++++++++
 target/arm/systems/beaglebone-black  |  1 +
 target/linux/config/Config.in.serial |  2 ++
 3 files changed, 17 insertions(+)

(limited to 'target')

diff --git a/target/arm/Makefile b/target/arm/Makefile
index b7e5e9f98..e298ff2d7 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -128,6 +128,12 @@ ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'qemu-system-arm $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(ROOTFSJFFS2)'
 endif
 endif
+ifeq ($(ADK_TARGET_FS),genimage)
+targethelp:
+	@echo "The disk image is: $(FW_DIR)/disk.img"
+	@echo "Use following command to install it on SD card:"
+	@echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k'
+endif
 
 kernel-strip:
 ifeq ($(ADK_TARGET_KERNEL_VERSION_RPI),y)
@@ -157,6 +163,11 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERS
 	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
 		dtbs $(MAKE_TRACE)
 endif
+ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y)
+	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
+		am335x-boneblack.dtb
+	cp $(LINUX_DIR)/arch/arm/boot/dts/am335x-boneblack.dtb ${TARGET_DIR}/boot
+endif
 ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
 	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
 		dtbs $(MAKE_TRACE)
@@ -192,6 +203,9 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfspiggyback)
 imageinstall: dtb-install createinitramfs targethelp
 endif
+ifeq (${ADK_TARGET_FS},genimage)
+imageinstall: dtb-install $(FW_DIR)/$(GENIMAGE) targethelp
+endif
 ifeq ($(ADK_TARGET_FS),nfsroot)
 imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
 endif
diff --git a/target/arm/systems/beaglebone-black b/target/arm/systems/beaglebone-black
index 736975ae0..d14e6da19 100644
--- a/target/arm/systems/beaglebone-black
+++ b/target/arm/systems/beaglebone-black
@@ -16,6 +16,7 @@ config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
+	select ADK_PACKAGE_U_BOOT
 	help
 	  BeagleBone Black
 
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index af8fed395..34d1ec2de 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -242,6 +242,8 @@ config ADK_KERNEL_SERIAL_PMACZILOG
 
 config ADK_KERNEL_SERIAL_OMAP
 	bool "omap serial driver"
+	select ADK_KERNEL_SERIAL_8250
+	select ADK_KERNEL_SERIAL_8250_CONSOLE
 	select ADK_KERNEL_SERIAL_OMAP_CONSOLE
 	depends on ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default y if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-- 
cgit v1.2.3