beaglebone: u-boot and kernel updates
v2 cover beaglebone: u-boot and kernel updates
Hi,
This patch series upgrades the kernel for the BeagleBone to 3.12.
The 3.12 kernel is taken from TI's own repo, and the actual branch/commit used is the latest used in their own BSP (see meta-ti for OpenEmbedded / Yocto).
I've tried to keep the defconfig as close to the 3.8 version as possible. Though, it's quite likely that some added configuration could have been removed.
It's only been tested on a BeagleBone White, using my usual NFS-root setup.
The PM FW in am33x-cm3 has been update to keep it in sync with the kernel. The revision used is taken from meta-ti.
There's also an update to the latest U-Boot, and as a followup to that patch, a change to zImage instead of uImage. (As that's the current default in U-Boot).
Cheers,
Anders
Changelog:
v1 -> v2:
* update the git sha1 to the latest applied to the meta-ti repo.
Anders Darander (4):
beaglebone: update to TI 3.12 kernel
am33x-cm3: update to latest version
beaglebone: update to latest U-Boot
beaglebone: change to zImage
.../{linux-3.8.config => linux-3.12.config} | 104 ++++++++++++++-------
configs/beaglebone_defconfig | 7 +-
.../am33x-cm3/am33x-cm3-0001-fix-makefile.patch | 16 ++--
package/am33x-cm3/am33x-cm3.mk | 2 +-
4 files changed, 86 insertions(+), 43 deletions(-)
rename board/beaglebone/{linux-3.8.config => linux-3.12.config} (68%)Signature · 1 line
1.8.5.3
PATCH v2 1/4 beaglebone: update to TI 3.12 kernel
Git repo version is taken from meta-ti. It's a 3.12.8 kernel with TI's own patches on top.
The defconfig has been kept rather close to our old defconfig. The kernel has been boot-tested using an NFS-root.
---
.../{linux-3.8.config => linux-3.12.config} | 104 ++++++++++++++-------
configs/beaglebone_defconfig | 4 +-
2 files changed, 74 insertions(+), 34 deletions(-)
rename board/beaglebone/{linux-3.8.config => linux-3.12.config} (68%)board/beaglebone/linux-3.12.config renamed from board/beaglebone/linux-3.8.config +72 -32
@@ -1,5 +1,3 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_DEFAULT_HOSTNAME="beaglebone" CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ=y
@@ -9,39 +7,67 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y CONFIG_SLAB=y CONFIG_PROFILING=y -CONFIG_OPROFILE=m 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_OMAP=y +CONFIG_ARCH_OMAP2PLUS=y CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_MUX_DEBUG=y -# CONFIG_ARCH_OMAP2 is not set -# CONFIG_ARCH_OMAP3 is not set -# CONFIG_ARCH_OMAP4 is not set +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_ARM_ERRATA_720789=y -CONFIG_ARM_ARCH_TIMER=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_AUTO_ZRELADDR=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
@@ -58,44 +84,45 @@ CONFIG_IP_PNP_RARP=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_OMAP_OCP2SCP=y -CONFIG_OMAP_INTERCONNECT=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_ATA=y -# CONFIG_SATA_PMP is not set -CONFIG_SATA_AHCI_PLATFORM=m -# CONFIG_ATA_SFF is not set +CONFIG_MD=y CONFIG_NETDEVICES=y -CONFIG_MII=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_MICROCHIP 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_POLLDEV=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_MISC=y +CONFIG_SERIO_LIBPS2=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=y
@@ -106,11 +133,15 @@ 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_DEBUG_PINCTRL=y +CONFIG_SPI_TI_QSPI=y CONFIG_PINCTRL_SINGLE=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y
@@ -120,27 +151,31 @@ 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_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y CONFIG_USB_MON=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_MUSB_AM35X=m +CONFIG_USB_MUSB_OMAP2PLUS=m +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_TI_CPPI41_DMA=y CONFIG_USB_STORAGE=y -CONFIG_USB_TEST=y -CONFIG_OMAP_USB2=m -CONFIG_OMAP_USB3=m -CONFIG_OMAP_CONTROL_USB=y +CONFIG_AM335X_PHY_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG=y -CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_DEBUG_FS=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m
@@ -152,6 +187,7 @@ 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
@@ -168,7 +204,10 @@ CONFIG_RTC_DRV_OMAP=y CONFIG_DMADEVICES=y CONFIG_TI_EDMA=y CONFIG_DMA_OMAP=y -CONFIG_STAGING=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
@@ -178,23 +217,24 @@ CONFIG_QFMT_V2=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set 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_DEBUG_INFO=y 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
configs/beaglebone_defconfig +2 -2
@@ -31,8 +31,8 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO" 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="935f6c2f82056d538b528272e2bdbb5c08d69a58" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="af17c0c3a9f2f787f731e6124766443f8343be17" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.8.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.12.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone"
Signature · 1 line
1.8.5.3
PATCH v2 2/4 am33x-cm3: update to latest version
In reply to Anders DaranderThis goes hand-in-hand with the kernel update.
The version is taken from meta-ti.
The new kernel version, 3.12, requires a newer PM FW.
--- package/am33x-cm3/am33x-cm3-0001-fix-makefile.patch | 16 ++++++++++------ package/am33x-cm3/am33x-cm3.mk | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-)
package/am33x-cm3/am33x-cm3-0001-fix-makefile.patch +10 -6
@@ -11,16 +11,20 @@ Fix this by explicitly indicating -march=armv7-m. Signed-off-by: Thomas Petazzoni <[email protected]> +Updated the patch to the latest version of the Makefile + +Signed-off-by: Anders Darander <[email protected]> + Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -13,7 +13,7 @@ +@@ -13,7 +13,7 @@ SRCDIR = src BINDIR = bin INCLUDES = $(SRCDIR)/include --CFLAGS =-mcpu=cortex-m3 -mthumb -nostdlib -Wall -g -I$(INCLUDES) -+CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -g -I$(INCLUDES) - LDFLAGS =-nostartfiles -fno-exceptions -Tfirmware.ld - - EXECUTABLE=am335x-pm-firmware.elf +-CFLAGS =-mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \ ++CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \ + -Werror-implicit-function-declaration -Wstrict-prototypes \ + -Wdeclaration-after-statement -fno-delete-null-pointer-checks \ + -Wempty-body -fno-strict-overflow -g -I$(INCLUDES) -O2
package/am33x-cm3/am33x-cm3.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -AM33X_CM3_VERSION = AM335xPSP_04.06.00.10-rc1 +AM33X_CM3_VERSION = v05.00.00.01 AM33X_CM3_SITE = http://arago-project.org/git/projects/am33x-cm3.git AM33X_CM3_SITE_METHOD = git AM33X_CM3_LICENSE = TI Publicly Available Software License
Signature · 1 line
1.8.5.3
PATCH v2 3/4 beaglebone: update to latest U-Boot
In reply to Anders DaranderUpdate to the default version of U-Boot, at this time 2013.10.
Tested with an old uEnv.txt (i.e. using uImage) and with the currently prefered zImage.
--- configs/beaglebone_defconfig | 2 -- 1 file changed, 2 deletions(-)
configs/beaglebone_defconfig +0 -2
@@ -21,8 +21,6 @@ BR2_DEFAULT_KERNEL_VERSION="3.8.12" # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="am335x_evm" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO"
Signature · 1 line
1.8.5.3
PATCH v2 4/4 beaglebone: change to zImage
In reply to Anders DaranderThe default U-Boot configuration is now to use a zImage instead of uImage.
--- configs/beaglebone_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/beaglebone_defconfig +1 -0
@@ -32,5 +32,6 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kern BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="af17c0c3a9f2f787f731e6124766443f8343be17" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.12.config" +BR2_LINUX_KERNEL_ZIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone"
Signature · 1 line
1.8.5.3