Skip to contentSkip to conversation

Updated the Beaglebone configuration:

PATCH New Chris LaRocque 2 participants 5 messages Jan 3, 2016 – Jan 5, 2016

lore
Share & tools
lore

Chris LaRocque

author
#0 lore raw

PATCH 1/2 Updated the Beaglebone configuration:

From: Chris LaRocque <[email protected]>

Changed to Kernel from Beagleboard.org 4.1.13-ti-r36.
added uboot 2015.10 patches from https://github.com/eewiki/u-boot-patches/blob/master/v2015.10/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch
Changed to the beagloeboard.org patched DTC from https://github.com/RobertCNelson/dtc.git bb.org-4.1-dt-overlays5

Signed-off-by Chris LaRocque <[email protected]>
---
 board/beaglebone/linux-3.12.config                 | 251 -------
 ...cache-flush-management-symbols-when-MULTI.patch |  34 -
 .../0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch   | 754 +++++++++++++++++++++
 board/beaglebone/uEnv.txt                          |  14 +-
 configs/beaglebone_defconfig                       |  43 +-
 package/dtc/Config.in                              |   2 +-
 package/dtc/Config.in.host                         |   2 +-
 package/dtc/dtc.hash                               |   2 -
 package/dtc/dtc.mk                                 |   6 +-
 9 files changed, 804 insertions(+), 304 deletions(-)
 delete mode 100644 board/beaglebone/linux-3.12.config
 delete mode 100644 board/beaglebone/patches/linux/linux-0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch
 create mode 100644 board/beaglebone/patches/uboot/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch
 delete mode 100644 package/dtc/dtc.hash
board/beaglebone/linux-3.12.config deleted +0 -251
deleted file mode 100644
index 0be5722..0000000
@@ -1,251 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_KPROBES=y
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX_DEBUG=y
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
-CONFIG_SOC_AM43XX=y
-# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set
-# CONFIG_SOC_TI81XX is not set
-# CONFIG_MACH_OMAP3_BEAGLE is not set
-# CONFIG_MACH_DEVKIT8000 is not set
-# CONFIG_MACH_OMAP_LDP is not set
-# CONFIG_MACH_OMAP3530_LV_SOM is not set
-# CONFIG_MACH_OMAP3_TORPEDO is not set
-# CONFIG_MACH_OVERO is not set
-# CONFIG_MACH_OMAP3EVM is not set
-# CONFIG_MACH_OMAP3_PANDORA is not set
-# CONFIG_MACH_TOUCHBOOK is not set
-# CONFIG_MACH_OMAP_3430SDP is not set
-# CONFIG_MACH_NOKIA_RM680 is not set
-# CONFIG_MACH_NOKIA_RX51 is not set
-# CONFIG_MACH_OMAP_ZOOM2 is not set
-# CONFIG_MACH_OMAP_ZOOM3 is not set
-# CONFIG_MACH_CM_T35 is not set
-# CONFIG_MACH_CM_T3517 is not set
-# CONFIG_MACH_IGEP0020 is not set
-# CONFIG_MACH_IGEP0030 is not set
-# CONFIG_MACH_SBC3530 is not set
-# CONFIG_MACH_OMAP_3630SDP is not set
-CONFIG_ARM_THUMBEE=y
-CONFIG_HAVE_ARM_ARCH_TIMER=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
-CONFIG_KEXEC=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_GENERIC_CPUFREQ_CPU0=y
-# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
-CONFIG_FPE_NWFPE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_BINFMT_MISC=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_LRO is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_OMAP_OCP2SCP=y
-CONFIG_CONNECTOR=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_CROSSBAR=y
-CONFIG_EEPROM_93CX6=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_MD=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_TI_CPSW=y
-CONFIG_TI_CPTS=y
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_AT803X_PHY=y
-CONFIG_SMSC_PHY=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_OMAP=y
-CONFIG_SPI=y
-CONFIG_SPI_OMAP24XX=y
-CONFIG_SPI_TI_QSPI=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_DEBUG_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_W1=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_THERMAL=y
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_CPU_THERMAL=y
-CONFIG_TI_SOC_THERMAL=y
-CONFIG_TI_THERMAL=y
-CONFIG_WATCHDOG=y
-CONFIG_OMAP_WATCHDOG=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TPS65217=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_PBIAS=y
-CONFIG_REGULATOR_TPS65023=y
-CONFIG_REGULATOR_TPS6507X=y
-CONFIG_REGULATOR_TPS65217=y
-CONFIG_REGULATOR_TIAVSCLASS0=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DA8XX=y
-CONFIG_FB_DA8XX_TDA998X=y
-CONFIG_OMAP2_DSS=y
-CONFIG_OMAP2_DSS_SDI=y
-CONFIG_OMAP2_DSS_DSI=y
-CONFIG_FB_OMAP2=y
-CONFIG_DISPLAY_CONNECTOR_HDMI=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_MON=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_OMAP2PLUS=m
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_TI_CPPI41_DMA=y
-CONFIG_USB_STORAGE=y
-CONFIG_AM335X_PHY_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG=y
-CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_MMC=y
-CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_SDIO_UART=y
-CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_OMAP=y
-CONFIG_DMADEVICES=y
-CONFIG_TI_EDMA=y
-CONFIG_DMA_OMAP=y
-CONFIG_TI_CPPI41=y
-CONFIG_COMMON_CLK_DEBUG=y
-CONFIG_OMAP_USB2=y
-CONFIG_OMAP_PIPE3=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-CONFIG_QUOTA=y
-CONFIG_QFMT_V2=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_PROVE_LOCKING=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC7=y
-CONFIG_LIBCRC32C=y
-CONFIG_AVERAGE=y
board/beaglebone/patches/linux/linux-0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch deleted +0 -34
deleted file mode 100644
index 1ca1e70..0000000
@@ -1,34 +0,0 @@
-From 29885f2f3d700341d322274db6ad085e601c0994 Mon Sep 17 00:00:00 2001
-From: Pantelis Antoniou <[email protected]>
-Date: Fri, 4 Jan 2013 00:32:33 +0200
-Subject: [PATCH 3/3] arm: Export cache flush management symbols when
- !MULTI_CACHE
-
-When compiling a kernel without CONFIG_MULTI_CACHE enabled the
-dma access functions end up not being exported. Fix it.
-
-Signed-off-by: Pantelis Antoniou <[email protected]>
----
- arch/arm/kernel/setup.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index da1d1aa..dcb678c 100644
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -923,3 +923,12 @@ const struct seq_operations cpuinfo_op = {
- 	.stop	= c_stop,
- 	.show	= c_show
- };
-+
-+/* export the cache management functions */
-+#ifndef MULTI_CACHE
-+
-+EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area));
-+EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area));
-+EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range));
-+
-+#endif
--- 
-1.7.10.4
-
board/beaglebone/patches/uboot/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch new file +754 -0

754 lines not on this page · raw message

board/beaglebone/uEnv.txt +12 -2
index e09fff5..b6de9ff 100644
@@ -1,3 +1,13 @@
-bootpart=0:1
 bootdir=
-uenvcmd=run loadimage;run loadramdisk;run findfdt;run loadfdt;run ramboot
+bootfile=zImage
+fdtfile=am335x-boneblack.dtb
+loadaddr=0x80007fc0
+fdtaddr=0x80F80000
+loadfdt=fatload mmc 0:1 ${fdtaddr} ${fdtfile}
+loaduimage=fatload mmc 0:1 ${loadaddr} ${bootfile}
+console=ttyO0,115200n8
+mmcroot=/dev/mmcblk0p2
+mmcrootfstype=ext2
+uenvcmd=mmc rescan; run loaduimage; run loadfdt; run fdtboot
+fdtboot=run mmc_args; run mmcargs; bootz ${loadaddr} - ${fdtaddr}
+mmc_args=setenv bootargs console=${console} ${optargs} root=${mmcroot} rw rootfstype=${mmcrootfstype} rootwait
configs/beaglebone_defconfig +33 -10

72 lines not on this page · raw message

package/dtc/Config.in +1 -1
index 39223f7..ec44cfc 100644
@@ -8,7 +8,7 @@ config BR2_PACKAGE_DTC
 	  Note that only the library is installed.
 	  If you want the programs, say 'y' here, and to "dtc programs", below.
 
-	  https://git.kernel.org/cgit/utils/dtc/dtc.git
+	  https://github.com/RobertCNelson/dtc
 
 if BR2_PACKAGE_DTC
package/dtc/Config.in.host +1 -1
index cbabf0a..196b702 100644
@@ -6,4 +6,4 @@ config BR2_PACKAGE_HOST_DTC
 
 	  Install host tools: dtc, convert-dtsv0, fdtdump, fdtget and fdtput.
 
-	  https://git.kernel.org/cgit/utils/dtc/dtc.git
+	  https://github.com/RobertCNelson/dtc
package/dtc/dtc.hash deleted +0 -2
deleted file mode 100644
index 8b3af33..0000000
@@ -1,2 +0,0 @@
-# from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc
-sha256 77992ad8eac7b68f553d0ba58e5b51604ac803d126196c99e3ae38aaae28bb94  dtc-1.4.1.tar.xz
package/dtc/dtc.mk +3 -3
index f3b6f3b..dede664 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-DTC_VERSION = 1.4.1
-DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz
-DTC_SITE = https://www.kernel.org/pub/software/utils/dtc
+DTC_VERSION = bb.org-4.1-dt-overlays5
+DTC_SITE = https://github.com/RobertCNelson/dtc
+DTC_SITE_METHOD = git
 DTC_LICENSE = GPLv2+/BSD-2c
 DTC_LICENSE_FILES = README.license GPL
 DTC_INSTALL_STAGING = YES
Signature · 1 line
1.8.1.4
author
#1 lore raw

PATCH 2/2 Update the Beaglbone configuration:

Patched the bb.org_defconfig to enable the beaglebone console on ttyS0
De-Selected the am33xx_cm3 firmware installation: the M3 control is handled differently in ver 4.1 Selected the uio-PRUSS driver to be installed.
Fixed the kernel patch path and file names.

Signed-off-by Chris LaRocque <[email protected]>
---
 .../linux-4.1.13-ti-r36-am335x-boneblack_01.patch  | 128 +++++++++++++++++++++
 configs/beaglebone_defconfig                       |   8 +-
 2 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +128 -0
new file mode 100644
index 0000000..76075d7
@@ -0,0 +1,128 @@
+--- a/arch/arm/configs/bb.org_defconfig	2016-01-02 09:21:52.569371375 -0500
++++ b/arch/arm/configs/bb.org_defconfig	2016-01-02 09:26:48.072415069 -0500
+@@ -37,10 +37,8 @@
+ CONFIG_HAVE_KERNEL_XZ=y
+ CONFIG_HAVE_KERNEL_LZO=y
+ CONFIG_HAVE_KERNEL_LZ4=y
+-# CONFIG_KERNEL_GZIP is not set
+ # CONFIG_KERNEL_LZMA is not set
+-# CONFIG_KERNEL_XZ is not set
+-CONFIG_KERNEL_LZO=y
++# CONFIG_KERNEL_LZO is not set
+ # CONFIG_KERNEL_LZ4 is not set
+ CONFIG_DEFAULT_HOSTNAME="(none)"
+ CONFIG_SWAP=y
+@@ -544,7 +542,6 @@
+ CONFIG_HZ=100
+ CONFIG_SCHED_HRTICK=y
+ # CONFIG_THUMB2_KERNEL is not set
+-CONFIG_AEABI=y
+ # CONFIG_OABI_COMPAT is not set
+ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+ # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+@@ -596,7 +593,7 @@
+ #
+ CONFIG_USE_OF=y
+ CONFIG_ATAGS=y
+-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
++CONFIG_DEPRECATED_PARAM_STRUCT=y
+ CONFIG_ZBOOT_ROM_TEXT=0x0
+ CONFIG_ZBOOT_ROM_BSS=0x0
+ # CONFIG_ARM_APPENDED_DTB is not set
+@@ -804,7 +801,7 @@
+ CONFIG_NETLABEL=y
+ CONFIG_NETWORK_SECMARK=y
+ CONFIG_NET_PTP_CLASSIFY=y
+-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
++CONFIG_NETWORK_PHY_TIMESTAMPING=y
+ CONFIG_NETFILTER=y
+ # CONFIG_NETFILTER_DEBUG is not set
+ CONFIG_NETFILTER_ADVANCED=y
+@@ -1467,8 +1464,6 @@
+ #
+ CONFIG_UEVENT_HELPER=y
+ CONFIG_UEVENT_HELPER_PATH=""
+-CONFIG_DEVTMPFS=y
+-CONFIG_DEVTMPFS_MOUNT=y
+ CONFIG_STANDALONE=y
+ CONFIG_PREVENT_FIRMWARE_BUILD=y
+ CONFIG_FW_LOADER=y
+@@ -1716,7 +1711,7 @@
+ CONFIG_SRAM=y
+ CONFIG_VEXPRESS_SYSCFG=y
+ CONFIG_BONE_CAPEMGR=y
+-# CONFIG_DEV_OVERLAYMGR is not set
++CONFIG_DEV_OVERLAYMGR=y
+ CONFIG_TIEQEP=m
+ CONFIG_C2PORT=m
+ 
+@@ -2214,8 +2209,9 @@
+ # CONFIG_DP83867_PHY is not set
+ # CONFIG_FIXED_PHY is not set
+ # CONFIG_MDIO_BITBANG is not set
++CONFIG_MDIO_BUS_MUX=y
+ # CONFIG_MDIO_BUS_MUX_GPIO is not set
+-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
++CONFIG_MDIO_BUS_MUX_MMIOREG=y
+ # CONFIG_MDIO_BCM_UNIMAC is not set
+ # CONFIG_MICREL_KS8995MA is not set
+ # CONFIG_PLIP is not set
+@@ -2716,7 +2712,8 @@
+ CONFIG_CONSOLE_POLL=y
+ # CONFIG_SERIAL_JSM is not set
+ CONFIG_SERIAL_OF_PLATFORM=y
+-# CONFIG_SERIAL_OMAP is not set
++CONFIG_SERIAL_OMAP=y
++CONFIG_SERIAL_OMAP_CONSOLE=y
+ # CONFIG_SERIAL_SCCNXP is not set
+ # CONFIG_SERIAL_SC16IS7XX is not set
+ # CONFIG_SERIAL_BCM63XX is not set
+@@ -2897,10 +2894,7 @@
+ # PTP clock support
+ #
+ CONFIG_PTP_1588_CLOCK=y
+-
+-#
+-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+-#
++# CONFIG_DP83640_PHY is not set
+ CONFIG_PINCTRL=y
+ 
+ #
+@@ -5128,7 +5122,7 @@
+ CONFIG_ASYNC_TX_DMA=y
+ # CONFIG_DMATEST is not set
+ # CONFIG_AUXDISPLAY is not set
+-CONFIG_UIO=m
++CONFIG_UIO=y
+ # CONFIG_UIO_CIF is not set
+ CONFIG_UIO_PDRV_GENIRQ=m
+ CONFIG_UIO_DMEM_GENIRQ=m
+@@ -5136,7 +5130,7 @@
+ # CONFIG_UIO_SERCOS3 is not set
+ # CONFIG_UIO_PCI_GENERIC is not set
+ # CONFIG_UIO_NETX is not set
+-# CONFIG_UIO_PRUSS is not set
++CONFIG_UIO_PRUSS=m
+ # CONFIG_UIO_MF624 is not set
+ # CONFIG_VFIO is not set
+ CONFIG_VIRT_DRIVERS=y
+@@ -5680,7 +5674,8 @@
+ # File systems
+ #
+ CONFIG_DCACHE_WORD_ACCESS=y
+-# CONFIG_EXT2_FS is not set
++CONFIG_EXT2_FS=y
++# CONFIG_EXT2_FS_XATTR is not set
+ # CONFIG_EXT3_FS is not set
+ CONFIG_EXT4_FS=y
+ CONFIG_EXT4_USE_FOR_EXT23=y
+@@ -6478,3 +6473,8 @@
+ CONFIG_FONT_8x16=y
+ CONFIG_ARCH_HAS_SG_CHAIN=y
+ CONFIG_VIRTUALIZATION=y
++CONFIG_KERNEL_GZIP=y
++# CONFIG_KERNEL_XZ is not set
++CONFIG_AEABI=y
++CONFIG_DEVTMPFS=y
++CONFIG_DEVTMPFS_MOUNT=y
configs/beaglebone_defconfig +6 -2
index dea34d9..da4f0a2 100644
@@ -27,7 +27,7 @@ BR2_TARGET_GENERIC_HOSTNAME="beaglebone"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/measbone/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
 
 # filesystem
 BR2_PACKAGE_AM33X_CM3=y

@@ -56,10 +56,14 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/beagleboard/linux.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.1.13-ti-r36"
-BR2_LINUX_KERNEL_PATCH="board/measbone/patches/linux/"
+BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/board/beaglebone/patches/linux-4.1.13-ti-r36"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(TOPDIR)/output/build/linux-4.1.13-ti-r36/arch/arm/configs/bb.org_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_USE_INTREE_DTS=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone am335x-boneblack"
+
+# Firmware
+# BR2_PACKAGE_AM33X_CM3 is not set
+BR2_PACKAGE_AM335X_PRU_PACKAGE=y
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 2/2 Update the Beaglbone configuration:

Hi Chris,

This patch should be squashed with the previous one, i.e. you should send a
single patch that updates everything. Otherwise, if only the first patch is applied and not the second, you won't have a console or working M3.

Quoted 8 lines · Chris LaRocque

Patched the bb.org_defconfig to enable the beaglebone console on ttyS0
De-Selected the am33xx_cm3 firmware installation: the M3 control is handled differently in ver 4.1 Selected the uio-PRUSS driver to be installed.
Fixed the kernel patch path and file names.

Signed-off-by Chris LaRocque <[email protected]>
---
 .../linux-4.1.13-ti-r36-am335x-boneblack_01.patch  | 128 +++++++++++++++++++++

Instead of patching the kernel, you should create a config fragment. That's
much shorter. Alternatively, you could create a full defconfig for buildroot. Patching the in-tree defconfig like you do below is really ugly.

Note that it would also be nice if the config fragment would contain comments
that explain why these changes are needed.

Quoted 11 lines
 configs/beaglebone_defconfig                       |   8 +-
 2 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +1 -0
new file mode 100644
index 0000000..76075d7
@@ -0,0 +1,128 @@
+--- a/arch/arm/configs/bb.org_defconfig	2016-01-02 09:21:52.569371375 -0500

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 11

Quoted 10 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +10 -0
++++ b/arch/arm/configs/bb.org_defconfig	2016-01-02 09:26:48.072415069 -0500
+@@ -37,10 +37,8 @@
+ CONFIG_HAVE_KERNEL_XZ=y
+ CONFIG_HAVE_KERNEL_LZO=y
+ CONFIG_HAVE_KERNEL_LZ4=y
+-# CONFIG_KERNEL_GZIP is not set
+ # CONFIG_KERNEL_LZMA is not set
+-# CONFIG_KERNEL_XZ is not set
+-CONFIG_KERNEL_LZO=y
++# CONFIG_KERNEL_LZO is not set

There's no reason to change this, buildroot will do that automatically.

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 19

Quoted 8 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +8 -0
+ # CONFIG_KERNEL_LZ4 is not set
+ CONFIG_DEFAULT_HOSTNAME="(none)"
+ CONFIG_SWAP=y
+@@ -544,7 +542,6 @@
+ CONFIG_HZ=100
+ CONFIG_SCHED_HRTICK=y
+ # CONFIG_THUMB2_KERNEL is not set
+-CONFIG_AEABI=y

That's not really needed.

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 28

Quoted 9 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +9 -0
+ # CONFIG_OABI_COMPAT is not set
+ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+ # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+@@ -596,7 +593,7 @@
+ #
+ CONFIG_USE_OF=y
+ CONFIG_ATAGS=y
+-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
++CONFIG_DEPRECATED_PARAM_STRUCT=y

Why do you need this?

If you do need it, just add

CONFIG_DEPRECATED_PARAM_STRUCT=y

to the config fragment.

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 37

Quoted 9 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +9 -0
+ CONFIG_ZBOOT_ROM_TEXT=0x0
+ CONFIG_ZBOOT_ROM_BSS=0x0
+ # CONFIG_ARM_APPENDED_DTB is not set
+@@ -804,7 +801,7 @@
+ CONFIG_NETLABEL=y
+ CONFIG_NETWORK_SECMARK=y
+ CONFIG_NET_PTP_CLASSIFY=y
+-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
++CONFIG_NETWORK_PHY_TIMESTAMPING=y

I also don't see why you need this.

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 46

Quoted 9 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +9 -0
+ CONFIG_NETFILTER=y
+ # CONFIG_NETFILTER_DEBUG is not set
+ CONFIG_NETFILTER_ADVANCED=y
+@@ -1467,8 +1464,6 @@
+ #
+ CONFIG_UEVENT_HELPER=y
+ CONFIG_UEVENT_HELPER_PATH=""
+-CONFIG_DEVTMPFS=y
+-CONFIG_DEVTMPFS_MOUNT=y

Will be handled automatically by buildroot.

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 55

Quoted 9 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +9 -0
+ CONFIG_STANDALONE=y
+ CONFIG_PREVENT_FIRMWARE_BUILD=y
+ CONFIG_FW_LOADER=y
+@@ -1716,7 +1711,7 @@
+ CONFIG_SRAM=y
+ CONFIG_VEXPRESS_SYSCFG=y
+ CONFIG_BONE_CAPEMGR=y
+-# CONFIG_DEV_OVERLAYMGR is not set
++CONFIG_DEV_OVERLAYMGR=y

Add the following to the config fragment:

CONFIG_DEV_OVERLAYMGR=y

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 63

Quoted 8 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +8 -0
+ CONFIG_TIEQEP=m
+ CONFIG_C2PORT=m
+ 
+@@ -2214,8 +2209,9 @@
+ # CONFIG_DP83867_PHY is not set
+ # CONFIG_FIXED_PHY is not set
+ # CONFIG_MDIO_BITBANG is not set
++CONFIG_MDIO_BUS_MUX=y

Is this needed? Does the beaglebone have an MDIO mux?

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 76

Quoted 13 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +13 -0
+ # CONFIG_MDIO_BUS_MUX_GPIO is not set
+-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
++CONFIG_MDIO_BUS_MUX_MMIOREG=y
+ # CONFIG_MDIO_BCM_UNIMAC is not set
+ # CONFIG_MICREL_KS8995MA is not set
+ # CONFIG_PLIP is not set
+@@ -2716,7 +2712,8 @@
+ CONFIG_CONSOLE_POLL=y
+ # CONFIG_SERIAL_JSM is not set
+ CONFIG_SERIAL_OF_PLATFORM=y
+-# CONFIG_SERIAL_OMAP is not set
++CONFIG_SERIAL_OMAP=y
++CONFIG_SERIAL_OMAP_CONSOLE=y

These two you can add to the config fragment.

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 88

Quoted 12 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +12 -0
+ # CONFIG_SERIAL_SCCNXP is not set
+ # CONFIG_SERIAL_SC16IS7XX is not set
+ # CONFIG_SERIAL_BCM63XX is not set
+@@ -2897,10 +2894,7 @@
+ # PTP clock support
+ #
+ CONFIG_PTP_1588_CLOCK=y
+-
+-#
+-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+-#
++# CONFIG_DP83640_PHY is not set

Ah, that's why you enabled the timestamping above. But I don't think the
beaglebone has this PHY. Did you copy it from your custom board?

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 97

Quoted 9 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +9 -0
+ CONFIG_PINCTRL=y
+ 
+ #
+@@ -5128,7 +5122,7 @@
+ CONFIG_ASYNC_TX_DMA=y
+ # CONFIG_DMATEST is not set
+ # CONFIG_AUXDISPLAY is not set
+-CONFIG_UIO=m
++CONFIG_UIO=y

Why is this needed?

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 106

Quoted 9 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +9 -0
+ # CONFIG_UIO_CIF is not set
+ CONFIG_UIO_PDRV_GENIRQ=m
+ CONFIG_UIO_DMEM_GENIRQ=m
+@@ -5136,7 +5130,7 @@
+ # CONFIG_UIO_SERCOS3 is not set
+ # CONFIG_UIO_PCI_GENERIC is not set
+ # CONFIG_UIO_NETX is not set
+-# CONFIG_UIO_PRUSS is not set
++CONFIG_UIO_PRUSS=m

I guess you do want this one.

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 115

Quoted 9 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +9 -0
+ # CONFIG_UIO_MF624 is not set
+ # CONFIG_VFIO is not set
+ CONFIG_VIRT_DRIVERS=y
+@@ -5680,7 +5674,8 @@
+ # File systems
+ #
+ CONFIG_DCACHE_WORD_ACCESS=y
+-# CONFIG_EXT2_FS is not set
++CONFIG_EXT2_FS=y

Is this needed? The ext4 driver will mount ext2 just fine, no?

board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch line 128

Quoted 13 lines
board/beaglebone/patches/linux-4.1.13-ti-r36/linux-4.1.13-ti-r36-am335x-boneblack_01.patch new file +13 -0
++# CONFIG_EXT2_FS_XATTR is not set
+ # CONFIG_EXT3_FS is not set
+ CONFIG_EXT4_FS=y
+ CONFIG_EXT4_USE_FOR_EXT23=y
+@@ -6478,3 +6473,8 @@
+ CONFIG_FONT_8x16=y
+ CONFIG_ARCH_HAS_SG_CHAIN=y
+ CONFIG_VIRTUALIZATION=y
++CONFIG_KERNEL_GZIP=y
++# CONFIG_KERNEL_XZ is not set
++CONFIG_AEABI=y
++CONFIG_DEVTMPFS=y
++CONFIG_DEVTMPFS_MOUNT=y

Heh, these are the changes applied by buildroot and duplicates of what you had
above already...

configs/beaglebone_defconfig BR2_TARGET_GENERIC_HOSTNAME="beaglebone" · line 30

Quoted 10 lines
configs/beaglebone_defconfig +1 -1
index dea34d9..da4f0a2 100644
@@ -27,7 +27,7 @@ BR2_TARGET_GENERIC_HOSTNAME="beaglebone"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/measbone/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"

Ah, so you fix it again here :-)

Quoted 8 lines
configs/beaglebone_defconfig +0 -1
 # filesystem
 BR2_PACKAGE_AM33X_CM3=y

@@ -56,10 +56,14 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/beagleboard/linux.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.1.13-ti-r36"
-BR2_LINUX_KERNEL_PATCH="board/measbone/patches/linux/"

configs/beaglebone_defconfig BR2_LINUX_KERNEL=y · line 68

Quoted 10 lines
configs/beaglebone_defconfig +4 -0
+BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/board/beaglebone/patches/linux-4.1.13-ti-r36"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(TOPDIR)/output/build/linux-4.1.13-ti-r36/arch/arm/configs/bb.org_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_USE_INTREE_DTS=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone am335x-boneblack"
+
+# Firmware
+# BR2_PACKAGE_AM33X_CM3 is not set

This isn't needed, it's off by default.

configs/beaglebone_defconfig BR2_LINUX_KERNEL=y · line 69

Quoted 1 line
configs/beaglebone_defconfig +1 -0
+BR2_PACKAGE_AM335X_PRU_PACKAGE=y

This one _is_ needed.

Regards,
Arnout

Quoted 1 line
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#3 lore raw

PATCH 1/2 Updated the Beaglebone configuration:

In reply to Chris LaRocque

Hi Chris,

The subject line of your patch should be something like:

configs: beaglebone: update kernel and uboot

Quoted 5 lines · Chris LaRocque

From: Chris LaRocque <[email protected]>

Changed to Kernel from Beagleboard.org 4.1.13-ti-r36.
added uboot 2015.10 patches from https://github.com/eewiki/u-boot-patches/blob/master/v2015.10/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch
Changed to the beagloeboard.org patched DTC from https://github.com/RobertCNelson/dtc.git bb.org-4.1-dt-overlays5

The commit message should be wrapped at 72 columns.

Also no need to quote the full URLs here, they're mentioned in the files below.
So the commit message could be something like:

configs: beaglebone: update kernel and uboot

Changed to linux 4.1.13-ti-r36 from beagleboard.org. Remove the no longer applicable linux patch.

Changed to uboot 2015.10 and added a patch from eewiki.

Patch dtc to the beagleboard.org version.

Update kernel config to use in-tree bb.org_defconfig with config fragments.

[See below for an explanation of the last two sentences.]

Quoted 6 lines
Signed-off-by Chris LaRocque <[email protected]>
---
 board/beaglebone/linux-3.12.config                 | 251 -------
 ...cache-flush-management-symbols-when-MULTI.patch |  34 -
 .../0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch   | 754 +++++++++++++++++++++

Instead of including the full patch here, it's probably better to set

BR2_TARGET_UBOOT_PATCH="https://github.com/eewiki/u-boot-patches/raw/master/v2015.10/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch"

Quoted 6 lines
 board/beaglebone/uEnv.txt                          |  14 +-
 configs/beaglebone_defconfig                       |  43 +-
 package/dtc/Config.in                              |   2 +-
 package/dtc/Config.in.host                         |   2 +-
 package/dtc/dtc.hash                               |   2 -
 package/dtc/dtc.mk                                 |   6 +-

This is not acceptable. This would change the DTC version for _all_ boards, not
just the beagleboard. We're not going to want this. Instead, a beaglebone-specific patch should be added. What you should do is:

1. Set

BR2_GLOBAL_PATCH_DIR=board/beaglebone/patches

2. Download the four final commits from
https://github.com/pantoniou/dtc/commits/dt-overlays5
as four separate patch files in board/beaglebone/patches/dtc. Make sure they are numbered 0001-... like the output of git-format-patch.

Now when you build the dtc for beaglebone, the overlays patches will be applied
to it. Note: I haven't tested if there is a conflict between these patches and the one we have in package/dtc/. If that is the case, you'll have to rework the overlay patches to solve the conflict.

BTW, if it would have been OK to modify the dtc package itself, then that
should have been a separate patch.

Quoted 5 lines
 9 files changed, 804 insertions(+), 304 deletions(-)
 delete mode 100644 board/beaglebone/linux-3.12.config
 delete mode 100644 board/beaglebone/patches/linux/linux-0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch
 create mode 100644 board/beaglebone/patches/uboot/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch
 delete mode 100644 package/dtc/dtc.hash

[snip]

board/beaglebone/uEnv.txt line 5

Quoted 12 lines
board/beaglebone/uEnv.txt +4 -2
index e09fff5..b6de9ff 100644
@@ -1,3 +1,13 @@
-bootpart=0:1
 bootdir=
-uenvcmd=run loadimage;run loadramdisk;run findfdt;run loadfdt;run ramboot
+bootfile=zImage
+fdtfile=am335x-boneblack.dtb
+loadaddr=0x80007fc0
+fdtaddr=0x80F80000

Aren't the defaults for these two OK?

board/beaglebone/uEnv.txt line 7

Quoted 2 lines
board/beaglebone/uEnv.txt +2 -0
+loadfdt=fatload mmc 0:1 ${fdtaddr} ${fdtfile}
+loaduimage=fatload mmc 0:1 ${loadaddr} ${bootfile}

Minor nit: you're loading a zImage, not a uImage, so calling it loaduimage is
weird. Just call it loadimage like in the default environment.

board/beaglebone/uEnv.txt line 12

Quoted 5 lines
board/beaglebone/uEnv.txt +5 -0
+console=ttyO0,115200n8
+mmcroot=/dev/mmcblk0p2
+mmcrootfstype=ext2
+uenvcmd=mmc rescan; run loaduimage; run loadfdt; run fdtboot
+fdtboot=run mmc_args; run mmcargs; bootz ${loadaddr} - ${fdtaddr}

I don't think there's an mmcargs environment variable.

configs/beaglebone_defconfig line 1

Quoted 7 lines
board/beaglebone/uEnv.txt +1 -0
+mmc_args=setenv bootargs console=${console} ${optargs} root=${mmcroot} rw rootfstype=${mmcrootfstype} rootwait
configs/beaglebone_defconfig +0 -0
index ddb583c..dea34d9 100644
@@ -1,14 +1,33 @@
 # architecture

There are a bunch of things here that you copied from the .config file but that
actually aren't necessary (they're not even user-visible options so they'll be completely ignored). You only need to explicitly set some options that are removed by 'make defconfig' because they are default, not the hidden options.

configs/beaglebone_defconfig line 2

Quoted 1 line
configs/beaglebone_defconfig +1 -0
+BR2_ARCH_HAS_MMU_OPTIONAL=y

This one.

Quoted 7 lines
configs/beaglebone_defconfig +6 -0
 BR2_arm=y
+BR2_ARCH="arm"
+BR2_ENDIAN="LITTLE"
+BR2_GCC_TARGET_ABI="aapcs-linux"
+BR2_GCC_TARGET_CPU="cortex-a8"
+BR2_GCC_TARGET_FPU="neon"
+BR2_GCC_TARGET_FLOAT_ABI="hard"

configs/beaglebone_defconfig line 19

Quoted 10 lines
configs/beaglebone_defconfig +10 -0
+BR2_GCC_TARGET_MODE="arm"
+BR2_ARCH_HAS_ATOMICS=y
+BR2_BINFMT_SUPPORTS_SHARED=y
+BR2_BINFMT_ELF=y
+BR2_ARM_CPU_HAS_NEON=y
+BR2_ARM_CPU_HAS_VFPV2=y
+BR2_ARM_CPU_HAS_VFPV3=y
+BR2_ARM_CPU_HAS_ARM=y
+BR2_ARM_CPU_HAS_THUMB2=y
+BR2_ARM_CPU_ARMV7A=y

Everything above except BR2_arm=y

configs/beaglebone_defconfig line 22

Quoted 3 lines
configs/beaglebone_defconfig +1 -0
 BR2_cortex_a8=y
 BR2_ARM_EABIHF=y
+BR2_ARM_FPU_NEON=y

This is bad, because it might break some packages (at runtime) because of
non-IEEE-754 arithmetic).

configs/beaglebone_defconfig line 23

Quoted 1 line
configs/beaglebone_defconfig +1 -0
+BR2_ARM_INSTRUCTIONS_ARM=y

This one can also be removed.

configs/beaglebone_defconfig line 30

Quoted 9 lines
configs/beaglebone_defconfig +2 -2
 # system
 BR2_TARGET_GENERIC_HOSTNAME="beaglebone"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/measbone/post-image.sh"

The measbone directory doesn't exist. Did you actually test this with a clean
repository?

configs/beaglebone_defconfig BR2_TARGET_ROOTFS_EXT2=y · line 41

Quoted 12 lines
configs/beaglebone_defconfig +3 -2
 # filesystem
 BR2_PACKAGE_AM33X_CM3=y

@@ -17,14 +36,17 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.10"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
+BR2_DEFAULT_KERNEL_VERSION="4.1.13"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_DEFAULT_KERNEL_HEADERS="4.1.13"

This one should be removed too.

configs/beaglebone_defconfig BR2_TARGET_ROOTFS_EXT2=y · line 46

Quoted 7 lines
configs/beaglebone_defconfig +1 -2
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
+BR2_TARGET_UBOOT_LATEST_VERSION=y

No, it should remain a custom version, not the latest version.

configs/beaglebone_defconfig BR2_TARGET_ROOTFS_EXT2=y · line 48

Quoted 2 lines
configs/beaglebone_defconfig +2 -0
+BR2_TARGET_UBOOT_VERSION="2015.10"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/board/beaglebone/patches/uboot/"

The $(TOPDIR) part should be removed. And if you set BR2_GLOBAL_PATCH_DIR it's
not even needed. And of course you can point directly to the patch to be downloaded instead of including it in buildroot.

Quoted 5 lines
configs/beaglebone_defconfig +1 -0
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"

configs/beaglebone_defconfig BR2_TARGET_UBOOT_SPL_NAME="MLO" · line 59

Quoted 9 lines
configs/beaglebone_defconfig +3 -3
@@ -32,11 +54,12 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7f280334068b7c875ade51f8f3921ab311f0c824"
-BR2_LINUX_KERNEL_PATCH="board/beaglebone/patches/linux/"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/beagleboard/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.1.13-ti-r36"
+BR2_LINUX_KERNEL_PATCH="board/measbone/patches/linux/"

measbone still doesn't exist, and anyway no linux patch should be needed
anymore, so leave this out completely.

configs/beaglebone_defconfig BR2_TARGET_UBOOT_SPL_NAME="MLO" · line 61

Quoted 3 lines
configs/beaglebone_defconfig +1 -1
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.12.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(TOPDIR)/output/build/linux-4.1.13-ti-r36/arch/arm/configs/bb.org_defconfig"

You should instead set BR2_LINUX_KERNEL_USE_DEFCONFIG=y and
BR2_LINUX_KERNEL_DEFCONFIG="bb.org"

Also, you should set

BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-4.1.config-fragment"

and of course create that file (see my comments in the next patch).

configs/beaglebone_defconfig BR2_TARGET_UBOOT_SPL_NAME="MLO" · line 65

Quoted 4 lines
configs/beaglebone_defconfig +1 -0
 BR2_LINUX_KERNEL_ZIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_USE_INTREE_DTS=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone am335x-boneblack"

[snip]

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
author Applied
#4 lore raw

PATCH 1/2 Updated the Beaglebone configuration:

Quoted 12 lines · Arnout Vandecappelle

Hi Chris,

The subject line of your patch should be something like:

configs: beaglebone: update kernel and uboot

Quoted 4 lines · Chris LaRocque

From: Chris LaRocque <[email protected]>

Changed to Kernel from Beagleboard.org 4.1.13-ti-r36. added uboot 2015.10 patches from

https://github.com/eewiki/u-boot-patches/blob/master/v2015.10/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch

Quoted 1 line
Quoted 1 line

Changed to the beagloeboard.org patched DTC from

https://github.com/RobertCNelson/dtc.git bb.org-4.1-dt-overlays5

Quoted 4 lines

The commit message should be wrapped at 72 columns.

Also no need to quote the full URLs here, they're mentioned in the files

below.

Quoted 4 lines

So the commit message could be something like:

configs: beaglebone: update kernel and uboot

Quoted 8 lines

Changed to linux 4.1.13-ti-r36 from beagleboard.org. Remove the no longer applicable linux patch.

Changed to uboot 2015.10 and added a patch from eewiki.

Patch dtc to the beagleboard.org version.

Update kernel config to use in-tree bb.org_defconfig with config

fragments.

Quoted 10 lines

[See below for an explanation of the last two sentences.]

Quoted 6 lines
Signed-off-by Chris LaRocque <[email protected]>
---
 board/beaglebone/linux-3.12.config                 | 251 -------
 ...cache-flush-management-symbols-when-MULTI.patch |  34 -
 .../0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch   | 754

+++++++++++++++++++++

Quoted 4 lines

Instead of including the full patch here, it's probably better to set

BR2_TARGET_UBOOT_PATCH="

https://github.com/eewiki/u-boot-patches/raw/master/v2015.10/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch
"

Quoted 10 lines
Quoted 8 lines

 board/beaglebone/uEnv.txt                          |  14 +-
 configs/beaglebone_defconfig                       |  43 +-
 package/dtc/Config.in                              |   2 +-
 package/dtc/Config.in.host                         |   2 +-
 package/dtc/dtc.hash                               |   2 -
 package/dtc/dtc.mk                                 |   6 +-

This is not acceptable. This would change the DTC version for _all_

boards, not

Quoted 11 lines

just the beagleboard. We're not going to want this. Instead, a beaglebone-specific patch should be added. What you should do is:

1. Set

BR2_GLOBAL_PATCH_DIR=board/beaglebone/patches

2. Download the four final commits from
https://github.com/pantoniou/dtc/commits/dt-overlays5
as four separate patch files in board/beaglebone/patches/dtc. Make sure

they are

Quoted 4 lines

numbered 0001-... like the output of git-format-patch.

Now when you build the dtc for beaglebone, the overlays patches will be

applied

Quoted 1 line

to it. Note: I haven't tested if there is a conflict between these

patches and

Quoted 1 line

the one we have in package/dtc/. If that is the case, you'll have to

rework the

Quoted 9 lines

overlay patches to solve the conflict.

BTW, if it would have been OK to modify the dtc package itself, then that
should have been a separate patch.

Quoted 3 lines
 9 files changed, 804 insertions(+), 304 deletions(-)
 delete mode 100644 board/beaglebone/linux-3.12.config
 delete mode 100644

board/beaglebone/patches/linux/linux-0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch

Quoted 1 line
Quoted 1 line
 create mode 100644

board/beaglebone/patches/uboot/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch

Quoted 4 lines
Quoted 1 line
 delete mode 100644 package/dtc/dtc.hash

[snip]

Quoted 8 lines

board/beaglebone/uEnv.txt line 3

Quoted 8 lines
board/beaglebone/uEnv.txt +0 -2
index e09fff5..b6de9ff 100644
@@ -1,3 +1,13 @@
-bootpart=0:1
 bootdir=
-uenvcmd=run loadimage;run loadramdisk;run findfdt;run loadfdt;run

ramboot

Quoted 11 lines

board/beaglebone/uEnv.txt line 5

Quoted 4 lines
board/beaglebone/uEnv.txt +4 -0
+bootfile=zImage
+fdtfile=am335x-boneblack.dtb
+loadaddr=0x80007fc0
+fdtaddr=0x80F80000

Aren't the defaults for these two OK?

board/beaglebone/uEnv.txt line 7

Quoted 2 lines
board/beaglebone/uEnv.txt +2 -0
+loadfdt=fatload mmc 0:1 ${fdtaddr} ${fdtfile}
+loaduimage=fatload mmc 0:1 ${loadaddr} ${bootfile}

Minor nit: you're loading a zImage, not a uImage, so calling it

loaduimage is

Quoted 11 lines

weird. Just call it loadimage like in the default environment.

board/beaglebone/uEnv.txt line 12

Quoted 5 lines
board/beaglebone/uEnv.txt +5 -0
+console=ttyO0,115200n8
+mmcroot=/dev/mmcblk0p2
+mmcrootfstype=ext2
+uenvcmd=mmc rescan; run loaduimage; run loadfdt; run fdtboot
+fdtboot=run mmc_args; run mmcargs; bootz ${loadaddr} - ${fdtaddr}

I don't think there's an mmcargs environment variable.

Quoted 1 line
board/beaglebone/uEnv.txt +1 -0
+mmc_args=setenv bootargs console=${console} ${optargs} root=${mmcroot}

rw rootfstype=${mmcrootfstype} rootwait

Quoted 8 lines

configs/beaglebone_defconfig line 1

Quoted 6 lines
configs/beaglebone_defconfig +0 -0
index ddb583c..dea34d9 100644
@@ -1,14 +1,33 @@
 # architecture

There are a bunch of things here that you copied from the .config file

but that

Quoted 1 line

actually aren't necessary (they're not even user-visible options so

they'll be

Quoted 2 lines

completely ignored). You only need to explicitly set some options that are removed by 'make defconfig' because they are default, not the hidden

options.

Quoted 37 lines

configs/beaglebone_defconfig line 2

Quoted 2 lines
configs/beaglebone_defconfig +1 -0
+BR2_ARCH_HAS_MMU_OPTIONAL=y

This one.

Quoted 7 lines
configs/beaglebone_defconfig +6 -0
 BR2_arm=y
+BR2_ARCH="arm"
+BR2_ENDIAN="LITTLE"
+BR2_GCC_TARGET_ABI="aapcs-linux"
+BR2_GCC_TARGET_CPU="cortex-a8"
+BR2_GCC_TARGET_FPU="neon"
+BR2_GCC_TARGET_FLOAT_ABI="hard"

configs/beaglebone_defconfig line 19

Quoted 10 lines
configs/beaglebone_defconfig +10 -0
+BR2_GCC_TARGET_MODE="arm"
+BR2_ARCH_HAS_ATOMICS=y
+BR2_BINFMT_SUPPORTS_SHARED=y
+BR2_BINFMT_ELF=y
+BR2_ARM_CPU_HAS_NEON=y
+BR2_ARM_CPU_HAS_VFPV2=y
+BR2_ARM_CPU_HAS_VFPV3=y
+BR2_ARM_CPU_HAS_ARM=y
+BR2_ARM_CPU_HAS_THUMB2=y
+BR2_ARM_CPU_ARMV7A=y

Everything above except BR2_arm=y

configs/beaglebone_defconfig line 22

Quoted 3 lines
configs/beaglebone_defconfig +1 -0
 BR2_cortex_a8=y
 BR2_ARM_EABIHF=y
+BR2_ARM_FPU_NEON=y

This is bad, because it might break some packages (at runtime) because of
non-IEEE-754 arithmetic).

configs/beaglebone_defconfig line 23

Quoted 1 line
configs/beaglebone_defconfig +1 -0
+BR2_ARM_INSTRUCTIONS_ARM=y

This one can also be removed.

Quoted 1 line
Quoted 10 lines

configs/beaglebone_defconfig line 30

Quoted 8 lines
 # system
 BR2_TARGET_GENERIC_HOSTNAME="beaglebone"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
configs/beaglebone_defconfig +2 -2
-BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/measbone/post-image.sh"

The measbone directory doesn't exist. Did you actually test this with a

clean

Quoted 27 lines

repository?

configs/beaglebone_defconfig BR2_TARGET_ROOTFS_EXT2=y · line 41

Quoted 12 lines
 # filesystem
 BR2_PACKAGE_AM33X_CM3=y
configs/beaglebone_defconfig +3 -2
@@ -17,14 +36,17 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.10"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
+BR2_DEFAULT_KERNEL_VERSION="4.1.13"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_DEFAULT_KERNEL_HEADERS="4.1.13"

This one should be removed too.

configs/beaglebone_defconfig BR2_TARGET_ROOTFS_EXT2=y · line 46

Quoted 7 lines
configs/beaglebone_defconfig +1 -2
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
+BR2_TARGET_UBOOT_LATEST_VERSION=y

No, it should remain a custom version, not the latest version.

Quoted 4 lines

configs/beaglebone_defconfig BR2_TARGET_ROOTFS_EXT2=y · line 48

Quoted 2 lines
configs/beaglebone_defconfig +2 -0
+BR2_TARGET_UBOOT_VERSION="2015.10"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/board/beaglebone/patches/uboot/"

The $(TOPDIR) part should be removed. And if you set

BR2_GLOBAL_PATCH_DIR it's

Quoted 12 lines

not even needed. And of course you can point directly to the patch to be downloaded instead of including it in buildroot.

configs/beaglebone_defconfig BR2_TARGET_UBOOT_SPL_NAME="MLO" · line 35

Quoted 9 lines
configs/beaglebone_defconfig +1 -1
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"

@@ -32,11 +54,12 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://

git.ti.com/ti-linux-kernel/ti-linux-kernel.git"

Quoted 1 line
Quoted 1 line

-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7f280334068b7c875ade51f8f3921ab311f0c824"

Quoted 2 lines

configs/beaglebone_defconfig

Quoted 2 lines
configs/beaglebone_defconfig +1 -1
-BR2_LINUX_KERNEL_PATCH="board/beaglebone/patches/linux/"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="

https://github.com/beagleboard/linux.git"

Quoted 9 lines

configs/beaglebone_defconfig BR2_TARGET_UBOOT_SPL_NAME="MLO" · line 59

Quoted 2 lines
configs/beaglebone_defconfig +2 -0
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.1.13-ti-r36"
+BR2_LINUX_KERNEL_PATCH="board/measbone/patches/linux/"

measbone still doesn't exist, and anyway no linux patch should be needed
anymore, so leave this out completely.

Quoted 2 lines

BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y

-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.12.config"

Quoted 1 line
Quoted 1 line

+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(TOPDIR)/output/build/linux-4.1.13-ti-r36/arch/arm/configs/bb.org_defconfig"

Quoted 7 lines

You should instead set BR2_LINUX_KERNEL_USE_DEFCONFIG=y and
BR2_LINUX_KERNEL_DEFCONFIG="bb.org"

Also, you should set

BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-4.1.config-fragment"

Quoted 15 lines

and of course create that file (see my comments in the next patch).

Quoted 4 lines

BR2_LINUX_KERNEL_ZIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_USE_INTREE_DTS=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone am335x-boneblack"

[snip]

Regards,
Arnout

Quoted 7 lines

--

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Thanks Arnout

I'll review, revise, and resubmit.

Regards

Chris

Pushing back the boundaries of ignorance
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160104/33321a48/attachment.html>