beaglebone-black: add special linux-repo, add uEnv.txt

7 files changed, 59 insertions, 4 deletions

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index b6b0f9d50..bf7eb91a6 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -10,7 +10,7 @@
 # KERNEL_RELEASE:  OpenADK internal versioning
 # KERNEL_VERSION:  final kernel version how we want to identify a specific kernel
 
-ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT)$(ADK_TARGET_KERNEL_VERSION_RPI)$(ADK_TARGET_KERNEL_VERSION_FSLC),y)
+ifeq ($(ADK_TARGET_KERNEL_GIT),y)
 ifneq ($(ADK_TARGET_KERNEL_HASH),)
 KERNEL_FILE_VER:=	$(ADK_TARGET_KERNEL_HASH)
 else
diff --git a/mk/linux.mk b/mk/linux.mk
index e6b1ffaca..fb4e983e2 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME:=	linux
 PKG_RELEASE:=	$(KERNEL_RELEASE)
-ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT)$(ADK_TARGET_KERNEL_VERSION_RPI)$(ADK_TARGET_KERNEL_VERSION_FSLC),y)
+ifeq ($(ADK_TARGET_KERNEL_GIT),y)
 ifneq ($(ADK_TARGET_KERNEL_HASH),)
 PKG_VERSION:=	$(ADK_TARGET_KERNEL_HASH)
 else
diff --git a/package/u-boot/files/uEnv.txt.bbb b/package/u-boot/files/uEnv.txt.bbb
new file mode 100644
index 000000000..3d83fe424
--- /dev/null
+++ b/package/u-boot/files/uEnv.txt.bbb
@@ -0,0 +1,12 @@
+loadaddr=0x82000000
+fdtaddr=0x88000000
+fdt_high=0xffffffff
+mmcroot=/dev/mmcblk0p2
+mmcfs=ext4
+kernelfile=kernel
+console=ttyO2,115200n8
+loadximage=load mmc 0:2 ${loadaddr} /boot/${kernelfile}
+loadxfdt=load mmc 0:2 ${fdtaddr} /boot/${fdtfile}
+loadall=run loadximage; run loadxfdt;
+mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcfs}
+uenvcmd=run loadall; run mmcargs; bootz ${loadaddr} - ${fdtaddr};
diff --git a/target/arm/beaglebone-black/genimage.cfg b/target/arm/beaglebone-black/genimage.cfg
new file mode 100644
index 000000000..b09ee55a1
--- /dev/null
+++ b/target/arm/beaglebone-black/genimage.cfg
@@ -0,0 +1,27 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"MLO",
+			"u-boot.img",
+			"uEnv.txt",
+		}
+	}
+	size = 16M
+}
+
+image disk.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		partition-type = 0xC
+		bootable = "true"
+                image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext"
+		size = 512M
+	}
+}
diff --git a/target/config/Config.in.kernelcfg b/target/config/Config.in.kernelcfg
index 76a294b0f..cbeacebcd 100644
--- a/target/config/Config.in.kernelcfg
+++ b/target/config/Config.in.kernelcfg
@@ -8,7 +8,8 @@ depends on ADK_TARGET_OS_LINUX
 config ADK_TARGET_KERNEL_USE_MINICONFIG
 	bool "Use mini.config from OpenADK"
 	depends on !ADK_TARGET_KERNEL_VERSION_RPI \
-		&& !ADK_TARGET_KERNEL_VERSION_FSLC
+		&& !ADK_TARGET_KERNEL_VERSION_FSLC \
+		&& !ADK_TARGET_KERNEL_VERSION_BB
 
 config ADK_TARGET_KERNEL_USE_DEFCONFIG
 	bool "Use defconfig from Linux kernel"
@@ -27,4 +28,5 @@ config ADK_TARGET_KERNEL_DEFCONFIG
 	default "nsim_hs_defconfig" if ADK_TARGET_SYSTEM_NSIM_ARCV2
 	default "10m50_defconfig" if ADK_TARGET_SYSTEM_QEMU_NIOS2
 	default "orca_defconfig" if ADK_TARGET_SYSTEM_ANDES_AG101P
+	default "bb.org_defconfig" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 5b3b04102..0b7706bcc 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -13,18 +13,26 @@ default ADK_TARGET_KERNEL_VERSION_4_7
 
 config ADK_TARGET_KERNEL_VERSION_GIT
 	bool "linux-git"
+	select ADK_TARGET_KERNEL_GIT
 	depends on !ADK_TARGET_ARCH_NDS32
 
 config ADK_TARGET_KERNEL_VERSION_FSLC
 	bool "linux-fslc"
+	select ADK_TARGET_KERNEL_GIT
 	select ADK_HOST_NEED_LZOP
 	select ADK_TARGET_KERNEL_IMAGE
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 
 config ADK_TARGET_KERNEL_VERSION_RPI
 	bool "linux-rpi"
+	select ADK_TARGET_KERNEL_GIT
 	depends on ADK_TARGET_BOARD_BCM28XX
 
+config ADK_TARGET_KERNEL_VERSION_BB
+	bool "linux-bb"
+	select ADK_TARGET_KERNEL_GIT
+	depends on ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+
 config ADK_TARGET_KERNEL_VERSION_4_7
 	bool "4.7.3"
 	depends on !ADK_TARGET_ARCH_METAG
@@ -185,15 +193,21 @@ config ADK_KERNEL_GITVER
 	default "git" if ADK_TARGET_KERNEL_VERSION_GIT
 	default "rpi" if ADK_TARGET_KERNEL_VERSION_RPI
 	default "fslc" if ADK_TARGET_KERNEL_VERSION_FSLC
+	default "bb" if ADK_TARGET_KERNEL_VERSION_BB
+
+config ADK_TARGET_KERNEL_GIT
+	bool
 
 config ADK_TARGET_KERNEL_REPO
 	string "git repository"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT \
 		|| ADK_TARGET_KERNEL_VERSION_RPI \
+		|| ADK_TARGET_KERNEL_VERSION_BB \
 		|| ADK_TARGET_KERNEL_VERSION_FSLC
 	default "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" if ADK_TARGET_KERNEL_VERSION_GIT
 	default "https://github.com/raspberrypi/linux.git" if ADK_TARGET_KERNEL_VERSION_RPI
 	default "https://github.com/SolidRun/linux-fslc.git" if ADK_TARGET_KERNEL_VERSION_FSLC
+	default "https://github.com/beagleboard/linux.git" if ADK_TARGET_KERNEL_VERSION_BB
 	help
 	  GIT repository to use.
 
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 278cbb4c2..c9b488360 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -280,7 +280,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttyS2" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "ttyPS0" if ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ
 	default "ttysclp0" if ADK_TARGET_SYSTEM_QEMU_S390
-	default "ttyO0" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	default "ttyO2" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "ttyS4" if ADK_TARGET_SYSTEM_IMGTEC_CI20
 	default "ttyS0"