Changeset 37175


Ignore:
Timestamp:
2013-07-05T00:25:26+02:00 (3 years ago)
Author:
wigyori
Message:

imx23: bump kernel to 3.10

  • fix BOARDNAME
  • add profile for Olinuxino boards
  • prep image Makefile for u-boot inclusion, separate out bootlet build
  • update kernel config to reflect updated chipidea requirements
  • update rtc/watchdog config

Signed-off-by: Zoltan HERPAI <wigyori@…>

Location:
trunk/target/linux/imx23
Files:
2 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/imx23/Makefile

    r37103 r37175  
    99ARCH:=arm 
    1010BOARD:=imx23 
    11 BOARDNAME:=Olinuxino i.MX233 
     11BOARDNAME:=Freescale i.MX23 series 
    1212FEATURES:=ext4 rtc usb gpio 
    1313CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves 
    1414MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu> 
    15 LINUX_VERSION:=3.9.8 
     15LINUX_VERSION:=3.10 
    1616KERNELNAME:="zImage dtbs" 
    17 DEPENDS:=+imx-bootlets 
     17#DEPENDS:=+imx-bootlets 
    1818 
    1919define Target/Description 
    20         Support for Olimex Olinuxino boards 
     20        Support for Freescale i.MX233-based boards 
    2121endef 
    2222 
    2323include $(INCLUDE_DIR)/target.mk 
    2424 
    25 DEFAULT_PACKAGES += dnsmasq imx-bootlets kmod-usb-chipidea kmod-usb-net kmod-usb-net-smsc95xx \ 
    26         kmod-wdt-stmp3xxx kmod-gpio-mcp23s08 kmod-leds-gpio kmod-ledtrig-heartbeat 
     25DEFAULT_PACKAGES += kmod-wdt-stmp3xxx 
    2726 
    2827$(eval $(call BuildTarget)) 
  • trunk/target/linux/imx23/config-default

    r37038 r37175  
    55CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y 
    66CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y 
     7CONFIG_ARCH_MULTIPLATFORM=y 
     8CONFIG_ARCH_MULTI_CPU_AUTO=y 
     9# CONFIG_ARCH_MULTI_V4 is not set 
     10# CONFIG_ARCH_MULTI_V4T is not set 
     11CONFIG_ARCH_MULTI_V4_V5=y 
     12CONFIG_ARCH_MULTI_V5=y 
     13# CONFIG_ARCH_MULTI_V6 is not set 
     14# CONFIG_ARCH_MULTI_V7 is not set 
    715CONFIG_ARCH_MXS=y 
    816# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set 
     
    1321CONFIG_ARCH_SUSPEND_POSSIBLE=y 
    1422CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y 
     23# CONFIG_ARCH_WM8505 is not set 
    1524CONFIG_ARM=y 
    1625CONFIG_ARM_AMBA=y 
    1726CONFIG_ARM_APPENDED_DTB=y 
    1827# CONFIG_ARM_ATAG_DTB_COMPAT is not set 
    19 # CONFIG_ARM_CPU_SUSPEND is not set 
     28CONFIG_ARM_CPU_SUSPEND=y 
    2029CONFIG_ARM_L1_CACHE_SHIFT=5 
    2130CONFIG_ARM_NR_BANKS=8 
     
    2433CONFIG_ARM_THUMB=y 
    2534CONFIG_ATAGS=y 
     35CONFIG_AUTO_ZRELADDR=y 
    2636# CONFIG_CACHE_L2X0 is not set 
    2737CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    2838CONFIG_CLKDEV_LOOKUP=y 
    2939CONFIG_CLKSRC_MMIO=y 
     40CONFIG_CLKSRC_OF=y 
    3041CONFIG_CLONE_BACKWARDS=y 
    3142CONFIG_CMDLINE="console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait" 
     
    4354# CONFIG_CPU_DCACHE_WRITETHROUGH is not set 
    4455# CONFIG_CPU_ICACHE_DISABLE is not set 
     56CONFIG_CPU_IDLE=y 
     57CONFIG_CPU_IDLE_GOV_LADDER=y 
     58CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y 
    4559CONFIG_CPU_PABRT_LEGACY=y 
     60CONFIG_CPU_PM=y 
    4661CONFIG_CPU_TLB_V4WBI=y 
    4762CONFIG_CPU_USE_DOMAINS=y 
     
    6782CONFIG_GENERIC_CLOCKEVENTS=y 
    6883CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
    69 CONFIG_GENERIC_GPIO=y 
     84CONFIG_GENERIC_IDLE_POLL_SETUP=y 
    7085CONFIG_GENERIC_IO=y 
    7186CONFIG_GENERIC_IRQ_CHIP=y 
     
    94109CONFIG_HAVE_CLK=y 
    95110CONFIG_HAVE_CLK_PREPARE=y 
     111CONFIG_HAVE_CONTEXT_TRACKING=y 
    96112CONFIG_HAVE_C_RECORDMCOUNT=y 
    97113CONFIG_HAVE_DEBUG_KMEMLEAK=y 
     
    105121CONFIG_HAVE_GENERIC_DMA_COHERENT=y 
    106122CONFIG_HAVE_GENERIC_HARDIRQS=y 
     123CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y 
    107124CONFIG_HAVE_KERNEL_GZIP=y 
    108125CONFIG_HAVE_KERNEL_LZMA=y 
     
    119136CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 
    120137CONFIG_HAVE_UID16=y 
     138CONFIG_HZ_PERIODIC=y 
    121139CONFIG_I2C=y 
    122140CONFIG_I2C_ALGOBIT=y 
    123141CONFIG_I2C_ALGOPCA=y 
    124142CONFIG_I2C_ALGOPCF=y 
     143# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set 
    125144CONFIG_I2C_BOARDINFO=y 
    126145CONFIG_I2C_CHARDEV=y 
     
    145164CONFIG_LZO_COMPRESS=y 
    146165CONFIG_LZO_DECOMPRESS=y 
    147 CONFIG_MACH_MXS_DT=y 
    148166CONFIG_MDIO_BOARDINFO=y 
    149167CONFIG_MMC=y 
     
    158176CONFIG_NEED_PER_CPU_KM=y 
    159177# CONFIG_NET_DMA is not set 
    160 CONFIG_NET_VENDOR_WIZNET=y 
     178# CONFIG_NET_IP_TUNNEL is not set 
    161179CONFIG_NLS=y 
    162180CONFIG_OF=y 
    163181CONFIG_OF_ADDRESS=y 
    164182CONFIG_OF_DEVICE=y 
    165 # CONFIG_OF_DISPLAY_TIMING is not set 
    166183CONFIG_OF_EARLY_FLATTREE=y 
    167184CONFIG_OF_FLATTREE=y 
     
    172189CONFIG_OF_MTD=y 
    173190CONFIG_OF_NET=y 
    174 # CONFIG_OF_VIDEOMODE is not set 
    175191CONFIG_OLD_SIGACTION=y 
    176192CONFIG_OLD_SIGSUSPEND3=y 
     
    201217CONFIG_REGULATOR=y 
    202218CONFIG_REGULATOR_DEBUG=y 
     219# CONFIG_REGULATOR_DUMMY is not set 
    203220CONFIG_REGULATOR_FIXED_VOLTAGE=y 
    204221CONFIG_REGULATOR_GPIO=y 
     222# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set 
     223# CONFIG_RFKILL_REGULATOR is not set 
    205224CONFIG_RTC_CLASS=y 
    206 # CONFIG_RTC_DRV_RX4581 is not set 
    207 CONFIG_RTC_DRV_STMP=y 
     225# CONFIG_RTC_DRV_STMP is not set 
     226# CONFIG_SAMSUNG_USB2PHY is not set 
     227# CONFIG_SAMSUNG_USB3PHY is not set 
     228# CONFIG_SAMSUNG_USBPHY is not set 
    208229CONFIG_SCHED_HRTICK=y 
    209230# CONFIG_SCSI_DMA is not set 
    210 # CONFIG_SERIAL_AMBA_PL010 is not set 
     231CONFIG_SERIAL_AMBA_PL010=y 
     232CONFIG_SERIAL_AMBA_PL010_CONSOLE=y 
    211233CONFIG_SERIAL_AMBA_PL011=y 
    212234CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 
    213235CONFIG_SERIAL_MXS_AUART=y 
    214 # CONFIG_SERIAL_MXS_AUART_CONSOLE is not set 
     236CONFIG_SERIAL_MXS_AUART_CONSOLE=y 
    215237CONFIG_SMSC_PHY=y 
    216238CONFIG_SOC_IMX23=y 
     
    219241CONFIG_SPI=y 
    220242CONFIG_SPI_MASTER=y 
    221 CONFIG_SPI_MXS=y 
     243# CONFIG_SPI_MXS is not set 
    222244CONFIG_SPLIT_PTLOCK_CPUS=999999 
    223 # CONFIG_STMP3XXX_RTC_WATCHDOG is not set 
    224245CONFIG_STMP_DEVICE=y 
    225246CONFIG_SYS_SUPPORTS_APM_EMULATION=y 
     247# CONFIG_TEGRA_HOST1X is not set 
    226248CONFIG_TICK_CPU_ACCOUNTING=y 
    227249CONFIG_UID16=y 
    228250CONFIG_UIDGID_CONVERTED=y 
    229251# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set 
     252CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" 
    230253CONFIG_USB=y 
    231254# CONFIG_USB_ARCH_HAS_OHCI is not set 
    232255# CONFIG_USB_ARCH_HAS_XHCI is not set 
    233256CONFIG_USB_COMMON=y 
    234 # CONFIG_USB_EHCI_HCD is not set 
     257CONFIG_USB_EHCI_HCD=y 
     258# CONFIG_USB_EHCI_HCD_PLATFORM is not set 
    235259# CONFIG_USB_MXS_PHY is not set 
     260CONFIG_USB_OTG=y 
     261CONFIG_USB_PHY=y 
    236262CONFIG_USB_SUPPORT=y 
    237263CONFIG_USE_OF=y 
     
    239265# CONFIG_VFP is not set 
    240266CONFIG_WATCHDOG_CORE=y 
    241 # CONFIG_WIZNET_W5100 is not set 
    242 # CONFIG_WIZNET_W5300 is not set 
    243267CONFIG_XZ_DEC_ARM=y 
    244268CONFIG_XZ_DEC_BCJ=y 
  • trunk/target/linux/imx23/image/Makefile

    r37038 r37175  
    55# See /LICENSE for more information. 
    66# 
     7 
    78include $(TOPDIR)/rules.mk 
    89include $(INCLUDE_DIR)/image.mk 
     10 
     11define Image/BuildKernel/olinuxino-bootlet 
     12        cat $(LINUX_DIR)/arch/arm/boot/zImage $(LINUX_DIR)/arch/arm/boot/dts/imx23-olinuxino.dtb > $(STAGING_DIR)/zImage_dtb 
     13        (cd $(STAGING_DIR); \ 
     14        $(STAGING_DIR)/../host/bin/elftosb -z -c ./linux_prebuilt.db -o linux.sb; \ 
     15        dd if=/dev/zero of=sd_mmc_bootstream.raw bs=512 count=4; \ 
     16        dd if=linux.sb of=$(BIN_DIR)/openwrt-imx23-sbImage ibs=512 seek=4; \ 
     17        ) 
     18endef 
     19 
     20define Image/BuildKernel 
     21 
     22  ifeq ($(CONFIG_PACKAGE_imx-bootlets),y) 
     23        $(call Image/BuildKernel/olinuxino-bootlet) 
     24  endif 
     25 
     26endef 
    927 
    1028define Image/Build 
     
    1331endef 
    1432 
    15 define Image/BuildKernel 
    16         cat $(LINUX_DIR)/arch/arm/boot/zImage $(LINUX_DIR)/arch/arm/boot/dts/imx23-olinuxino.dtb > $(STAGING_DIR)/zImage_dtb 
    17         (cd $(STAGING_DIR); \ 
    18                 ../host/bin/elftosb -z -c ./linux_prebuilt.db -o linux.sb \ 
    19                 dd if=/dev/zero of=sd_mmc_bootstream.raw bs=512 count=4; \ 
    20                 dd if=linux.sb of=$(BIN_DIR)/openwrt-imx23-sbImage ibs=512 seek=4; \ 
    21         ) 
    22 endef 
     33$(eval $(call BuildImage)) 
    2334 
    24 $(eval $(call BuildImage)) 
  • trunk/target/linux/imx23/modules.mk

    r37038 r37175  
    55# See /LICENSE for more information. 
    66 
     7define KernelPackage/rtc-stmp3xxx 
     8    SUBMENU:=$(OTHER_MENU) 
     9    TITLE:=STMP3xxx SoC built-in RTC support 
     10    DEPENDS:=@(TARGET_imx23) 
     11    $(call AddDepends/rtc) 
     12    KCONFIG:=\ 
     13        CONFIG_RTC_CLASS=y \ 
     14        CONFIG_RTC_DRV_STMP=m 
     15    FILES:=$(LINUX_DIR)/drivers/rtc/rtc-stmp3xxx.ko 
     16    AUTOLOAD:=$(call AutoLoad,50,rtc-stmp3xxx) 
     17endef 
     18 
     19$(eval $(call KernelPackage,rtc-stmp3xxx)) 
     20 
    721define KernelPackage/wdt-stmp3xxx 
    822    SUBMENU:=$(OTHER_MENU) 
    923    TITLE:=STMP3xxx Watchdog timer 
    10     DEPENDS:=@(TARGET_imx23) 
     24    DEPENDS:=kmod-rtc-stmp3xxx 
    1125    KCONFIG:=CONFIG_STMP3XXX_RTC_WATCHDOG 
    1226    FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/stmp3xxx_rtc_wdt.ko 
    13     AUTOLOAD:=$(call AutoLoad,50,stmp3xxx_rtc_wdt) 
     27    AUTOLOAD:=$(call AutoLoad,51,stmp3xxx_rtc_wdt) 
    1428endef 
    1529 
     
    1933 
    2034$(eval $(call KernelPackage,wdt-stmp3xxx)) 
     35 
    2136define KernelPackage/usb-chipidea 
    2237    TITLE:=Support for ChipIdea controllers 
    23     DEPENDS:=+kmod-usb2 +kmod-usb-mxs-phy 
    2438    KCONFIG:= \ 
    2539        CONFIG_USB_CHIPIDEA \ 
     
    4155define KernelPackage/usb-mxs-phy 
    4256    TITLE:=Support for Freescale MXS USB PHY controllers 
    43     DEPENDS:=+kmod-usb2 
     57    DEPENDS:=+kmod-usb-chipidea 
    4458    KCONFIG:= \ 
    4559        CONFIG_USB_MXS_PHY 
    46         FILES:=$(LINUX_DIR)/drivers/usb/otg/mxs-phy.ko 
    47     AUTOLOAD:=$(call AutoLoad,50,mxs-phy,1) 
     60        FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko 
     61    AUTOLOAD:=$(call AutoLoad,50,phy-mxs-usb,1) 
    4862    $(call AddDepends/usb) 
    4963endef 
     
    6983$(eval $(call KernelPackage,usb-net-smsc95xx)) 
    7084 
    71  
Note: See TracChangeset for help on using the changeset viewer.