Changeset 36452


Ignore:
Timestamp:
2013-04-26T18:55:40+02:00 (5 years ago)
Author:
juhosg
Message:

at91: upgrade to kernel 3.8.7 and use devicetree

This upgrades the AT91 target to 3.8.7, and migrates to device tree.
This allows a single kernel to be built for most at91 variants which
simplifies things quite a bit. The immediate result is that all
subtargets are nuked, and any boards without dts files are no longer
supported, though the target now includes more boards than before. The
adc driver was also nuked as 3.8.7 includes a new one under the IIO
subsystem.

Signed-off-by: Adam Porter <porter.adam@…>
Signed-off-by: Gabor Juhos <juhosg@…>

Location:
trunk/target/linux/at91
Files:
6 added
5 deleted
4 edited
1 copied

Legend:

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

    r32055 r36452  
    11#  
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2013 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1313FEATURES:=squashfs jffs2 targz ext2 usb 
    1414CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves 
    15 SUBTARGETS:=9g20 9260 9263 
    1615 
    17 LINUX_VERSION:=3.3.8 
    18 DEVICE_TYPE= 
     16LINUX_VERSION:=3.8.7 
    1917 
    2018include $(INCLUDE_DIR)/target.mk 
    2119 
    22 DEFAULT_PACKAGES+= kmod-usb-ohci 
    23 KERNELNAME:="uImage" 
     20DEFAULT_PACKAGES += kmod-usb-ohci 
    2421 
    2522$(eval $(call BuildTarget)) 
  • trunk/target/linux/at91/config-default

    r35156 r36452  
    11CONFIG_ALIGNMENT_TRAP=y 
    22CONFIG_ARCH_AT91=y 
    3 # CONFIG_ARCH_AT91CAP9 is not set 
    43# CONFIG_ARCH_AT91RM9200 is not set 
    54# CONFIG_ARCH_AT91SAM9260 is not set 
     
    109# CONFIG_ARCH_AT91SAM9G45 is not set 
    1110# CONFIG_ARCH_AT91SAM9RL is not set 
    12 # CONFIG_ARCH_AT91X40 is not set 
     11CONFIG_ARCH_AT91_NONE=y 
    1312CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y 
    14 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 
     13CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y 
     14CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y 
     15# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set 
    1516CONFIG_ARCH_NR_GPIO=0 
    1617CONFIG_ARCH_REQUIRE_GPIOLIB=y 
     
    1819# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set 
    1920CONFIG_ARCH_SUSPEND_POSSIBLE=y 
    20 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set 
     21# CONFIG_ARCH_VT8500_SINGLE is not set 
     22CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y 
    2123CONFIG_ARM=y 
     24CONFIG_ARM_APPENDED_DTB=y 
     25# CONFIG_ARM_ATAG_DTB_COMPAT is not set 
    2226# CONFIG_ARM_CPU_SUSPEND is not set 
    2327CONFIG_ARM_L1_CACHE_SHIFT=5 
    2428CONFIG_ARM_NR_BANKS=8 
     29CONFIG_ARM_PATCH_PHYS_VIRT=y 
    2530CONFIG_ARM_THUMB=y 
    26 # CONFIG_AT91SAM9X_WATCHDOG is not set 
    27 CONFIG_AT91_EARLY_DBGU0=y 
    28 # CONFIG_AT91_EARLY_USART0 is not set 
    29 # CONFIG_AT91_EARLY_USART1 is not set 
    30 # CONFIG_AT91_EARLY_USART2 is not set 
    31 # CONFIG_AT91_EARLY_USART3 is not set 
    32 # CONFIG_AT91_EARLY_USART4 is not set 
    33 # CONFIG_AT91_EARLY_USART5 is not set 
     31CONFIG_AT91SAM9X_WATCHDOG=y 
    3432CONFIG_AT91_PMC_UNIT=y 
    3533CONFIG_AT91_PROGRAMMABLE_CLOCKS=y 
     34CONFIG_AT91_SAM9G45_RESET=y 
    3635CONFIG_AT91_SAM9_ALT_RESET=y 
    3736CONFIG_AT91_TIMER_HZ=100 
    38 # CONFIG_ATMEL_PWM is not set 
     37CONFIG_ATAGS=y 
    3938# CONFIG_ATMEL_SSC is not set 
    4039# CONFIG_ATMEL_TCLIB is not set 
    41 CONFIG_BCMA_POSSIBLE=y 
    4240# CONFIG_BLK_DEV is not set 
    4341# CONFIG_BLK_DEV_INITRD is not set 
     
    4543CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    4644CONFIG_CLKDEV_LOOKUP=y 
     45CONFIG_CLONE_BACKWARDS=y 
    4746CONFIG_CPU_32v5=y 
    4847CONFIG_CPU_ABRT_EV5TJ=y 
     
    5958CONFIG_CPU_USE_DOMAINS=y 
    6059CONFIG_CRC16=y 
     60CONFIG_CRYPTO_CRC32C=y 
     61CONFIG_CRYPTO_HASH=y 
     62CONFIG_CRYPTO_HASH2=y 
    6163CONFIG_DEBUG_BUGVERBOSE=y 
     64CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" 
     65# CONFIG_DEBUG_PINCTRL is not set 
    6266# CONFIG_DEBUG_USER is not set 
    6367CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 
    64 # CONFIG_DW_WATCHDOG is not set 
     68CONFIG_DTC=y 
    6569CONFIG_EXT4_FS=y 
    6670CONFIG_FRAME_POINTER=y 
     
    7175CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
    7276CONFIG_GENERIC_GPIO=y 
     77CONFIG_GENERIC_IO=y 
    7378CONFIG_GENERIC_IRQ_SHOW=y 
    7479CONFIG_GENERIC_PCI_IOMAP=y 
     80CONFIG_GENERIC_SMP_IDLE_THREAD=y 
     81CONFIG_GENERIC_STRNCPY_FROM_USER=y 
     82CONFIG_GENERIC_STRNLEN_USER=y 
    7583CONFIG_GPIOLIB=y 
    7684CONFIG_GPIO_SYSFS=y 
     
    8189CONFIG_HAS_IOPORT=y 
    8290CONFIG_HAVE_AOUT=y 
     91CONFIG_HAVE_ARCH_JUMP_LABEL=y 
    8392CONFIG_HAVE_ARCH_KGDB=y 
    8493CONFIG_HAVE_ARCH_PFN_VALID=y 
     94CONFIG_HAVE_ARCH_SECCOMP_FILTER=y 
     95CONFIG_HAVE_ARCH_TRACEHOOK=y 
    8596CONFIG_HAVE_AT91_DBGU0=y 
    86 CONFIG_HAVE_AT91_USART3=y 
    87 CONFIG_HAVE_AT91_USART4=y 
    88 CONFIG_HAVE_AT91_USART5=y 
     97CONFIG_HAVE_AT91_DBGU1=y 
     98CONFIG_HAVE_BPF_JIT=y 
    8999CONFIG_HAVE_CLK=y 
    90100CONFIG_HAVE_C_RECORDMCOUNT=y 
     101CONFIG_HAVE_DEBUG_KMEMLEAK=y 
    91102CONFIG_HAVE_DMA_API_DEBUG=y 
     103CONFIG_HAVE_DMA_ATTRS=y 
     104CONFIG_HAVE_DMA_CONTIGUOUS=y 
    92105CONFIG_HAVE_DYNAMIC_FTRACE=y 
     106CONFIG_HAVE_FB_ATMEL=y 
    93107CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 
    94108CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 
     
    103117CONFIG_HAVE_LATENCYTOP_SUPPORT=y 
    104118CONFIG_HAVE_MEMBLOCK=y 
    105 CONFIG_HAVE_NET_MACB=y 
     119CONFIG_HAVE_NET_DSA=y 
    106120CONFIG_HAVE_OPROFILE=y 
    107121CONFIG_HAVE_PERF_EVENTS=y 
    108122CONFIG_HAVE_PROC_CPU=y 
    109123CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y 
    110 CONFIG_HAVE_SPARSE_IRQ=y 
     124CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 
     125CONFIG_HAVE_UID16=y 
     126CONFIG_IRQ_DOMAIN=y 
    111127# CONFIG_ISDN is not set 
    112128CONFIG_JBD2=y 
     129CONFIG_JFFS2_ZLIB=y 
    113130CONFIG_KTIME_SCALAR=y 
    114 # CONFIG_LEDS is not set 
    115 # CONFIG_LEDS_ATMEL_PWM is not set 
    116131CONFIG_LEDS_TRIGGER_HEARTBEAT=y 
    117 # CONFIG_MACB is not set 
    118 # CONFIG_MACH_ACMENETUSFOXG20 is not set 
    119 # CONFIG_MACH_AT91SAM9G20EK is not set 
    120 # CONFIG_MACH_AT91SAM_DT is not set 
    121 # CONFIG_MACH_CPU9G20 is not set 
    122 # CONFIG_MACH_GSIA18S is not set 
    123 # CONFIG_MACH_PCONTROL_G20 is not set 
    124 # CONFIG_MACH_PORTUXG20 is not set 
    125 # CONFIG_MACH_SNAPPER_9260 is not set 
    126 # CONFIG_MACH_STAMP9G20 is not set 
    127 # CONFIG_MACH_USB_A9G20 is not set 
     132CONFIG_MACB=y 
     133CONFIG_MACH_AT91SAM_DT=y 
    128134CONFIG_MDIO_BOARDINFO=y 
    129 # CONFIG_MFD_T7L66XB is not set 
    130135# CONFIG_MII is not set 
    131136CONFIG_MMC=y 
    132 CONFIG_MMC_AT91=y 
    133 # CONFIG_MMC_ATMELMCI is not set 
     137CONFIG_MMC_ATMELMCI=y 
    134138CONFIG_MMC_BLOCK=y 
     139CONFIG_MODULES_USE_ELF_REL=y 
    135140CONFIG_MTD_DATAFLASH=y 
    136141# CONFIG_MTD_DATAFLASH_OTP is not set 
    137142# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set 
     143CONFIG_MTD_NAND=y 
     144CONFIG_MTD_NAND_ATMEL=y 
     145CONFIG_MTD_NAND_ECC=y 
     146CONFIG_MTD_OF_PARTS=y 
     147# CONFIG_MTD_PHYSMAP_OF is not set 
     148# CONFIG_MTD_SM_COMMON is not set 
     149CONFIG_MULTI_IRQ_HANDLER=y 
    138150CONFIG_NEED_DMA_MAP_STATE=y 
     151CONFIG_NEED_MACH_GPIO_H=y 
    139152CONFIG_NEED_PER_CPU_KM=y 
     153CONFIG_NET_SCH_FQ_CODEL=y 
    140154CONFIG_NLS=y 
     155CONFIG_OF=y 
     156CONFIG_OF_ADDRESS=y 
     157CONFIG_OF_DEVICE=y 
     158CONFIG_OF_EARLY_FLATTREE=y 
     159CONFIG_OF_FLATTREE=y 
     160CONFIG_OF_GPIO=y 
     161CONFIG_OF_IRQ=y 
     162CONFIG_OF_MDIO=y 
     163CONFIG_OF_MTD=y 
     164CONFIG_OF_NET=y 
    141165CONFIG_PAGEFLAGS_EXTENDED=y 
    142166CONFIG_PAGE_OFFSET=0xC0000000 
    143167# CONFIG_PCI_SYSCALL is not set 
     168CONFIG_PERCPU_RWSEM=y 
    144169CONFIG_PERF_USE_VMALLOC=y 
    145170CONFIG_PHYLIB=y 
    146 CONFIG_PHYS_OFFSET=0x0 
     171CONFIG_PINCONF=y 
     172CONFIG_PINCTRL=y 
     173CONFIG_PINCTRL_AT91=y 
     174# CONFIG_PINCTRL_SINGLE is not set 
     175CONFIG_PINMUX=y 
    147176# CONFIG_PREEMPT_RCU is not set 
    148177CONFIG_RTC_CLASS=y 
     178# CONFIG_RTC_DRV_AT91RM9200 is not set 
    149179# CONFIG_RTC_DRV_AT91SAM9 is not set 
    150180# CONFIG_RTC_DRV_CMOS is not set 
     
    155185CONFIG_SERIAL_ATMEL_PDC=y 
    156186# CONFIG_SERIAL_ATMEL_TTYAT is not set 
     187# CONFIG_SOC_AT91RM9200 is not set 
     188CONFIG_SOC_AT91SAM9=y 
     189CONFIG_SOC_AT91SAM9260=y 
     190CONFIG_SOC_AT91SAM9261=y 
     191CONFIG_SOC_AT91SAM9263=y 
     192CONFIG_SOC_AT91SAM9G45=y 
     193CONFIG_SOC_AT91SAM9N12=y 
     194CONFIG_SOC_AT91SAM9RL=y 
     195CONFIG_SOC_AT91SAM9X5=y 
     196CONFIG_SPARSE_IRQ=y 
    157197CONFIG_SPI=y 
    158198CONFIG_SPI_ATMEL=y 
     
    162202# CONFIG_STAGING is not set 
    163203CONFIG_SYS_SUPPORTS_APM_EMULATION=y 
     204CONFIG_TICK_CPU_ACCOUNTING=y 
    164205CONFIG_UID16=y 
    165 # CONFIG_USB_ARCH_HAS_EHCI is not set 
     206CONFIG_UIDGID_CONVERTED=y 
    166207# CONFIG_USB_ARCH_HAS_XHCI is not set 
    167208CONFIG_USB_AT91=y 
    168 # CONFIG_USB_CDC_COMPOSITE is not set 
    169209CONFIG_USB_COMMON=y 
    170210CONFIG_USB_ETH=y 
    171211# CONFIG_USB_ETH_EEM is not set 
    172212CONFIG_USB_ETH_RNDIS=y 
    173 # CONFIG_USB_FILE_STORAGE is not set 
    174 # CONFIG_USB_FUNCTIONFS is not set 
    175 # CONFIG_USB_FUSB300 is not set 
    176213CONFIG_USB_GADGET=y 
    177 # CONFIG_USB_GADGETFS is not set 
    178 # CONFIG_USB_GADGET_DEBUG_FILES is not set 
    179 # CONFIG_USB_GADGET_DEBUG_FS is not set 
    180 CONFIG_USB_GADGET_VBUS_DRAW=2 
    181 # CONFIG_USB_G_DBGP is not set 
    182 # CONFIG_USB_G_HID is not set 
    183 # CONFIG_USB_G_NCM is not set 
    184 # CONFIG_USB_G_PRINTER is not set 
    185 # CONFIG_USB_G_SERIAL is not set 
    186 # CONFIG_USB_M66592 is not set 
    187 # CONFIG_USB_MV_UDC is not set 
    188 # CONFIG_USB_NET2272 is not set 
    189 # CONFIG_USB_R8A66597 is not set 
     214CONFIG_USB_LIBCOMPOSITE=y 
    190215CONFIG_USB_SUPPORT=y 
    191 # CONFIG_USB_ZERO is not set 
     216CONFIG_USE_OF=y 
    192217CONFIG_VECTORS_BASE=0xffff0000 
    193218# CONFIG_VFP is not set 
    194219# CONFIG_WLAN is not set 
    195 CONFIG_XZ_DEC=y 
    196220CONFIG_XZ_DEC_ARM=y 
    197221CONFIG_XZ_DEC_BCJ=y 
  • trunk/target/linux/at91/image/Makefile

    r31370 r36452  
    11#  
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2013 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1919 
    2020define Image/Prepare 
     21        cp $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/zImage 
     22endef 
     23 
     24define MkuImageDtb 
     25        cat $(KDIR)/zImage $(LINUX_DIR)/arch/arm/boot/dts/$(2).dtb > $(KDIR)/zImage-$(1) 
     26        mkimage -A arm -T kernel -C none -a 0x20008000 -e 0x20008000 \ 
     27                -n "OpenWrt ARM $(LINUX_VERSION)" \ 
     28                -d $(KDIR)/zImage-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage 
     29endef 
     30 
     31# Atmel 
     32Image/Build/Kernel/AT91SAM9263EK=$(call MkuImageDtb,9263ek,at91sam9263ek) 
     33Image/Build/Kernel/AT91SAM9G15EK=$(call MkuImageDtb,9g15ek,at91sam9g15ek) 
     34Image/Build/Kernel/AT91SAM9G20EK=$(call MkuImageDtb,9g20ek,at91sam9g20ek) 
     35Image/Build/Kernel/AT91SAM9G20EK-2MMC=$(call MkuImageDtb,9g20ek_2mmc,at91sam9g20ek_2mmc) 
     36Image/Build/Kernel/AT91SAM9G25EK=$(call MkuImageDtb,9g25ek,at91sam9g25ek) 
     37Image/Build/Kernel/AT91SAM9G35EK=$(call MkuImageDtb,9g35ek,at91sam9g35ek) 
     38Image/Build/Kernel/AT91SAM9M10G45EK=$(call MkuImageDtb,9m10g45ek,at91sam9m10g45ek) 
     39Image/Build/Kernel/AT91SAM9X25EK=$(call MkuImageDtb,9x25ek,at91sam9x25ek) 
     40Image/Build/Kernel/AT91SAM9X35EK=$(call MkuImageDtb,9x35ek,at91sam9x35ek) 
     41# CalAmp 
     42Image/Build/Kernel/LMU5000=$(call MkuImageDtb,lmu5000,lmu5000) 
     43# Caloa 
     44Image/Build/Kernel/TNYA9260=$(call MkuImageDtb,tny_a9260,tny_a9260) 
     45Image/Build/Kernel/TNYA9263=$(call MkuImageDtb,tny_a9263,tny_a9263) 
     46Image/Build/Kernel/TNYA9G20=$(call MkuImageDtb,tny_a9g20,tny_a9g20) 
     47Image/Build/Kernel/USBA9260=$(call MkuImageDtb,usb_a9260,usb_a9260) 
     48Image/Build/Kernel/USBA9263=$(call MkuImageDtb,usb_a9263,usb_a9263) 
     49Image/Build/Kernel/USBA9G20=$(call MkuImageDtb,usb_a9g20,usb_a9g20) 
     50# Ethernut 
     51Image/Build/Kernel/ETHERNUT5=$(call MkuImageDtb,ethernut5,ethernut5) 
     52 
     53define Image/Build/Kernel/Default 
     54        $(call Image/Build/Kernel/AT91SAM9263EK) 
     55        $(call Image/Build/Kernel/AT91SAM9G15EK) 
     56        $(call Image/Build/Kernel/AT91SAM9G20EK) 
     57        $(call Image/Build/Kernel/AT91SAM9G20EK-2MMC) 
     58        $(call Image/Build/Kernel/AT91SAM9G25EK) 
     59        $(call Image/Build/Kernel/AT91SAM9G35EK) 
     60        $(call Image/Build/Kernel/AT91SAM9M10G45EK) 
     61        $(call Image/Build/Kernel/AT91SAM9X25EK) 
     62        $(call Image/Build/Kernel/AT91SAM9X35EK) 
     63        $(call Image/Build/Kernel/LMU5000) 
     64        $(call Image/Build/Kernel/TNYA9260) 
     65        $(call Image/Build/Kernel/TNYA9263) 
     66        $(call Image/Build/Kernel/TNYA9G20) 
     67        $(call Image/Build/Kernel/USBA9260) 
     68        $(call Image/Build/Kernel/USBA9263) 
     69        $(call Image/Build/Kernel/USBA9G20) 
     70        $(call Image/Build/Kernel/ETHERNUT5) 
    2171endef 
    2272 
    2373define Image/BuildKernel 
    24         mkdir -p $(BIN_DIR) 
    2574        mkimage -A arm -T kernel -C none -a 0x20008000 -e 0x20008000 -n linux-2.6 \ 
    26                 -d $(LINUX_DIR)/arch/arm/boot/Image $(BIN_DIR)/$(IMG_PREFIX)-uImage 
     75                -d $(LINUX_DIR)/arch/arm/boot/Image $(BIN_DIR)/uImage 
    2776        if [ $(CONFIG_FLEXIBITY_ROOT) ]; then \ 
    28                 $(INSTALL_BIN) $(BIN_DIR)/$(IMG_PREFIX)-uImage $(TARGET_DIR)/uImage ; \ 
     77                $(INSTALL_BIN) $(BIN_DIR)/uImage $(TARGET_DIR)/uImage ; \ 
    2978        fi 
     79        $(call Image/Build/Kernel/$(PROFILE)) 
    3080endef 
    3181 
    3282define Image/Build 
    33         $(call Image/Build/$(1),$(1)) 
    34         mkdir -p $(BIN_DIR) 
     83        $(call Image/Build/$(1)) 
    3584        cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) 
    3685endef 
  • trunk/target/linux/at91/modules.mk

    r32910 r36452  
    4141  DEPENDS:=@TARGET_at91 
    4242  KCONFIG:=CONFIG_AT91_ADC 
    43   FILES:=$(LINUX_DIR)/drivers/misc/at91-adc.ko 
     43  FILES:=$(LINUX_DIR)/drivers/iio/adc/at91-adc.ko 
    4444  AUTOLOAD:=$(call AutoLoad,40,at91-adc) 
    4545endef 
  • trunk/target/linux/at91/profiles/00-default.mk

    r36451 r36452  
    77 
    88define Profile/Default 
    9         NAME:=Default Profile (all drivers) 
    10         PACKAGES:=kmod-usb-core kmod-usb2 kmod-usb2-fsl 
     9        NAME:=Default Profile 
    1110endef 
    1211 
     
    1413        Default package set compatible with most boards. 
    1514endef 
     15 
    1616$(eval $(call Profile,Default)) 
Note: See TracChangeset for help on using the changeset viewer.