beaglebone-black: some fixes, no serial output yet

mk/image.mk

@@ -274,7 +274,8 @@ ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
 ${FW_DIR}/${GENIMAGE}: ${TARGET_DIR} kernel-package
 	@rm -rf ${FW_DIR}/temp
 	@mkdir -p ${FW_DIR}/temp
-	@dd if=/dev/zero of=${FW_DIR}/cfgfs.img bs=16M count=1 $(MAKE_TRACE)
+	@$(CP) $(KERNEL) $(FW_DIR)/kernel
+	@dd if=/dev/zero of=${FW_DIR}/cfgfs.img bs=16384 count=1 $(MAKE_TRACE)
 	PATH='${HOST_PATH}' mke2img \
 		-G 4 \
 		-d "$(TARGET_DIR)" \

package/mtools/Makefile

@@ -20,6 +20,10 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,MTOOLS,mtools,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,MTOOLS,mtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(OS_FOR_BUILD),Darwin)
+HOST_LDFLAGS+=		-liconv
+endif
+
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 
 mtools-install:

package/u-boot/Makefile

@@ -16,7 +16,7 @@ PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro solidrun-imx6
+PKG_SYSTEM_DEPENDS:=	beaglebone-black raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro solidrun-imx6
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
@@ -42,6 +42,10 @@ ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
 CONFIG:=		Bananapro_defconfig
 UBOOT:=			u-boot-sunxi-with-spl.bin
 endif
+ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y)
+CONFIG:=		am335x_evm_defconfig
+UBOOT:=			u-boot.img
+endif
 
 HOST_MAKE_FLAGS+=	HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
 			HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
@@ -95,6 +99,10 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 	$(INSTALL_BIN) $(WRKBUILD)/SPL $(FW_DIR)
 	$(INSTALL_BIN) ./files/boot.script.imx6 $(FW_DIR)
 endif
+ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y)
+	$(CP) ./files/uEnv.txt.bbb $(FW_DIR)/uEnv.txt
+	$(INSTALL_BIN) $(WRKBUILD)/MLO $(FW_DIR)
+endif
 
 include $(ADK_TOPDIR)/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk

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

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
 

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