From d3baeb798874d68642f0c22c9726366a2f537282 Mon Sep 17 00:00:00 2001 From: Stephen Oliver Date: Sat, 18 Feb 2012 14:38:53 -0500 Subject: [PATCH] core/linux-am33x: include SPI userspace support for beaglebone headers, build in framebuffer support, remove unused ethernet modules --- ...33x-BeagleBone-userspace-SPI-support.patch | 51 ++++++++ core/linux-am33x/PKGBUILD | 61 +++++++++- core/linux-am33x/config | 113 +++++++++++------- core/linux-am33x/linux-am33x.install | 2 +- 4 files changed, 179 insertions(+), 48 deletions(-) create mode 100644 core/linux-am33x/ARM-omap-am33x-BeagleBone-userspace-SPI-support.patch diff --git a/core/linux-am33x/ARM-omap-am33x-BeagleBone-userspace-SPI-support.patch b/core/linux-am33x/ARM-omap-am33x-BeagleBone-userspace-SPI-support.patch new file mode 100644 index 000000000..347d2c1dc --- /dev/null +++ b/core/linux-am33x/ARM-omap-am33x-BeagleBone-userspace-SPI-support.patch @@ -0,0 +1,51 @@ +--- arch.orig/arm/mach-omap2/board-am335xevm.c 2012-02-18 10:43:40.000000000 -0500 ++++ arch/arm/mach-omap2/board-am335xevm.c 2012-02-18 10:43:29.000000000 -0500 +@@ -1518,6 +1518,16 @@ + }, + }; + ++static struct spi_board_info bone_am335x_slave_info[] = { ++ { ++ .modalias = "spidev", ++ .irq = -1, ++ .max_speed_hz = 12000000, ++ .bus_num = 2, ++ .chip_select = 0, ++ }, ++}; ++ + static void evm_nand_init(int evm_id, int profile) + { + setup_pin_mux(nand_pin_mux); +@@ -2061,6 +2071,15 @@ + return; + } + ++/* setup beaglebone spi1 */ ++static void bone_spi1_init(int evm_id, int profile) ++{ ++ setup_pin_mux(spi1_pin_mux); ++ spi_register_board_info(bone_am335x_slave_info, ++ ARRAY_SIZE(bone_am335x_slave_info)); ++ return; ++} ++ + + static int beaglebone_phy_fixup(struct phy_device *phydev) + { +@@ -2216,6 +2235,7 @@ + {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, + {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, + {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, ++ {bone_spi1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, + {NULL, 0, 0}, + }; + +@@ -2228,6 +2248,7 @@ + {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE}, + {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, + {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, ++ {bone_spi1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, + {NULL, 0, 0}, + }; + diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD index 948ca947f..a3d8d6dfd 100644 --- a/core/linux-am33x/PKGBUILD +++ b/core/linux-am33x/PKGBUILD @@ -12,16 +12,19 @@ pkgname=('linux-am33x' 'linux-headers-am33x') _kernelname=${pkgname#linux} _basekernel="am33x" pkgver=3.2 -pkgrel=alarm2 +pkgrel=alarm3 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git') options=('!strip') source=( "config" - "https://github.com/koenkooi/linux/zipball/beaglebone-3.2") -md5sums=('e68d149a9262bdd985f99a470f6fc903' - '82e2e714e34cfc6ddbfc628cdc7a4b1e') + "https://github.com/koenkooi/linux/zipball/beaglebone-3.2" + "ARM-omap-am33x-BeagleBone-userspace-SPI-support.patch") +md5sums=('aaa1ddae7405b431948942d5b67c3869' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '9d3e650dba24c16b6fa62c5ce0669d09') + build() { @@ -34,6 +37,8 @@ build() { cd $srcdir/linux + patch -Np0 -i "${srcdir}/ARM-omap-am33x-BeagleBone-userspace-SPI-support.patch" + make prepare make ${MAKEFLAGS} uImage modules @@ -188,3 +193,51 @@ package_linux-headers-am33x() { rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa} } +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '9d7de2020d65428e20de731a80e010cf') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '29079b6aceaf679167dfd7723da2ecf2') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + 'd74cfdb0db143a5262d483314cfd8095') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '3d28f52fd1270a4f09081fcc2b94ac82') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '0ffe80b6348788cbaec66c5c74603383') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '2aabc1d6bee3fe7065bb3ae42b4a80b2') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + 'e930c237d3a1fcf7980c5f90a1d9b101') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + 'e930c237d3a1fcf7980c5f90a1d9b101') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + 'd439794edf6c3959d1af35936d85daf6') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '432ce5b07ca7543ad3aed5776b46c21d') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '432ce5b07ca7543ad3aed5776b46c21d') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '72a3f68d7adf184a9334d730c8f7cb04') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '72a3f68d7adf184a9334d730c8f7cb04') +md5sums=('8c5ed69028a0940fc0e34ae83e4e0b9a' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '2cdaa0146ca61e917ad8e30f4aada1bd') +md5sums=('1b14c9b76364e84a23ccfa03ac1022dc' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '18f543164ad6a73c87ee599b961c201d') +md5sums=('a233566f6240421ad31c01e47140e39b' + '82e2e714e34cfc6ddbfc628cdc7a4b1e' + '18f543164ad6a73c87ee599b961c201d') diff --git a/core/linux-am33x/config b/core/linux-am33x/config index d4d45f302..9e77936bc 100644 --- a/core/linux-am33x/config +++ b/core/linux-am33x/config @@ -35,7 +35,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="-alarm3" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y @@ -138,6 +138,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y # # GCOV-based kernel profiling # +# CONFIG_GCOV_KERNEL is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -1030,35 +1031,24 @@ CONFIG_MII=y # CAIF transport drivers # CONFIG_ETHERNET=y -CONFIG_NET_VENDOR_BROADCOM=y -# CONFIG_B44 is not set -CONFIG_NET_VENDOR_CHELSIO=y +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_DM9000 is not set # CONFIG_DNET is not set -CONFIG_NET_VENDOR_FARADAY=y -# CONFIG_FTMAC100 is not set -# CONFIG_FTGMAC100 is not set -CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_I825XX=y -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_NET_VENDOR_MICREL=y -# CONFIG_KS8851 is not set -# CONFIG_KS8851_MLL is not set -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NET_VENDOR_8390=y -# CONFIG_AX88796 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_ETHOC is not set -CONFIG_NET_VENDOR_SEEQ=y -# CONFIG_SEEQ8005 is not set +# CONFIG_NET_VENDOR_SEEQ is not set CONFIG_NET_VENDOR_SMSC=y CONFIG_SMC91X=y # CONFIG_SMC911X is not set CONFIG_SMSC911X=y # CONFIG_SMSC911X_ARCH_HOOKS is not set -CONFIG_NET_VENDOR_STMICRO=y -# CONFIG_STMMAC_ETH is not set +# CONFIG_NET_VENDOR_STMICRO is not set CONFIG_NET_VENDOR_TI=y # CONFIG_TI_DAVINCI_EMAC is not set CONFIG_TI_DAVINCI_MDIO=y @@ -1121,7 +1111,7 @@ CONFIG_USB_NET_CDC_SUBSET=y # CONFIG_USB_NET_KALMIA is not set # CONFIG_USB_HSO is not set # CONFIG_USB_NET_INT51X1 is not set -# CONFIG_USB_IPHETH is not set +CONFIG_USB_IPHETH=m # CONFIG_USB_SIERRA_NET is not set # CONFIG_USB_VL600 is not set CONFIG_WLAN=y @@ -1631,19 +1621,22 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_DRM=m # CONFIG_VGASTATE is not set CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_FB=m -# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=m CONFIG_FB_CFB_COPYAREA=m CONFIG_FB_CFB_IMAGEBLIT=m # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +CONFIG_FB_FOREIGN_ENDIAN=y +CONFIG_FB_BOTH_ENDIAN=y +# CONFIG_FB_BIG_ENDIAN is not set +# CONFIG_FB_LITTLE_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set @@ -1656,16 +1649,43 @@ CONFIG_FB_TILEBLITTING=y # Frame buffer hardware drivers # # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_SMSCUFX=m CONFIG_FB_UDL=m CONFIG_FB_DA8XX=m CONFIG_FB_DA8XX_CONSISTENT_DMA_SIZE=4 -# CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_BROADSHEET is not set -CONFIG_FB_ST7735=m -# CONFIG_FB_OMAP is not set -# CONFIG_OMAP2_DSS is not set +CONFIG_FB_VIRTUAL=m +CONFIG_FB_METRONOME=m +CONFIG_FB_BROADSHEET=m +CONFIG_FB_ST7735=y +CONFIG_FB_OMAP_BOOTLOADER_INIT=y +CONFIG_OMAP2_VRAM=y +CONFIG_OMAP2_VRFB=y +CONFIG_OMAP2_DSS=m +CONFIG_OMAP2_VRAM_SIZE=0 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y +# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set +CONFIG_OMAP2_DSS_DPI=y +# CONFIG_OMAP2_DSS_RFBI is not set +CONFIG_OMAP2_DSS_VENC=y +# CONFIG_OMAP2_DSS_SDI is not set +# CONFIG_OMAP2_DSS_DSI is not set +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 +CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y +CONFIG_FB_OMAP2=m +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +CONFIG_FB_OMAP2_NUM_FBS=3 + +# +# OMAP2/3 Display Device Drivers +# +CONFIG_PANEL_GENERIC_DPI=m +CONFIG_PANEL_DVI=m +CONFIG_PANEL_LGPHILIPS_LB035Q02=m +CONFIG_PANEL_SHARP_LS037V7DW01=m +CONFIG_PANEL_NEC_NL8048HL11_01B=m +CONFIG_PANEL_PICODLP=m +CONFIG_PANEL_TPO_TD043MTEA1=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y # CONFIG_LCD_L4F00242T03 is not set @@ -1696,7 +1716,7 @@ CONFIG_DISPLAY_SUPPORT=y # Console display driver support # CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=m +CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y @@ -1949,6 +1969,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_YUREX is not set CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_FUSB300 is not set @@ -2164,7 +2185,9 @@ CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set @@ -2360,15 +2383,16 @@ CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_DEBUG_KERNEL is not set # CONFIG_HARDLOCKUP_DETECTOR is not set # CONFIG_SPARSE_RCU_POINTER is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_FRAME_POINTER=y +# CONFIG_LKDTM is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y @@ -2379,6 +2403,7 @@ CONFIG_RING_BUFFER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set @@ -2462,13 +2487,13 @@ CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=y # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_SHA1 is not set +CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set @@ -2506,7 +2531,9 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_USER_API_HASH is not set # CONFIG_CRYPTO_USER_API_SKCIPHER is not set -# CONFIG_CRYPTO_HW is not set +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_OMAP_SHAM=y +CONFIG_CRYPTO_DEV_OMAP_AES=y # CONFIG_BINARY_PRINTF is not set # diff --git a/core/linux-am33x/linux-am33x.install b/core/linux-am33x/linux-am33x.install index b3152c518..bb4ecec89 100644 --- a/core/linux-am33x/linux-am33x.install +++ b/core/linux-am33x/linux-am33x.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-am33x -KERNEL_VERSION=3.2.0 +KERNEL_VERSION=3.2.0alarm3 post_install () { # updating module dependencies