From mboxrd@z Thu Jan  1 00:00:00 1970
From: nicolas.ferre@atmel.com (Nicolas Ferre)
Date: Fri, 17 May 2013 15:03:50 +0200
Subject: [PATCH v2] ARM: at91: udpate defconfigs
In-Reply-To: <1368631161-31488-1-git-send-email-plagnioj@jcrosoft.com>
References: <1368631161-31488-1-git-send-email-plagnioj@jcrosoft.com>
Message-ID: <51962AB6.1080807@atmel.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On 15/05/2013 17:19, Jean-Christophe PLAGNIOL-VILLARD :
> merge 9g20 with 9260 and 9g10 with 9261 as those SoCs can run from the same
> kernel even in non DT world
>
> fix the sam9261ek to allow 9g10 and sam9261 to compile together
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

stacked on at91-3.11-cleanup branch.

Bye,

> ---
>   arch/arm/configs/at91_dt_defconfig                 |   55 ++---
>   arch/arm/configs/at91rm9200_defconfig              |  218 +++-----------------
>   ...am9g20_defconfig => at91sam9260_9g20_defconfig} |   67 ++++--
>   arch/arm/configs/at91sam9260_defconfig             |   91 --------
>   ...am9261_defconfig => at91sam9261_9g10_defconfig} |   19 +-
>   arch/arm/configs/at91sam9263_defconfig             |   39 ++--
>   arch/arm/configs/at91sam9g45_defconfig             |   94 +++------
>   arch/arm/configs/sama5_defconfig                   |   35 +++-
>   arch/arm/mach-at91/Kconfig.non_dt                  |  159 +++++++-------
>   arch/arm/mach-at91/Makefile                        |    2 -
>   arch/arm/mach-at91/board-sam9261ek.c               |   28 +--
>   11 files changed, 268 insertions(+), 539 deletions(-)
>   rename arch/arm/configs/{at91sam9g20_defconfig => at91sam9260_9g20_defconfig} (67%)
>   delete mode 100644 arch/arm/configs/at91sam9260_defconfig
>   rename arch/arm/configs/{at91sam9261_defconfig => at91sam9261_9g10_defconfig} (91%)
>
> diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
> index 047f2a4..a8800d3 100644
> --- a/arch/arm/configs/at91_dt_defconfig
> +++ b/arch/arm/configs/at91_dt_defconfig
> @@ -1,4 +1,3 @@
> -CONFIG_EXPERIMENTAL=y
>   # CONFIG_LOCALVERSION_AUTO is not set
>   # CONFIG_SWAP is not set
>   CONFIG_SYSVIPC=y
> @@ -25,8 +24,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>   CONFIG_AT91_TIMER_HZ=128
>   CONFIG_AEABI=y
>   # CONFIG_OABI_COMPAT is not set
> -CONFIG_LEDS=y
> -CONFIG_LEDS_CPU=y
>   CONFIG_UACCESS_WITH_MEMCPY=y
>   CONFIG_ZBOOT_ROM_TEXT=0x0
>   CONFIG_ZBOOT_ROM_BSS=0x0
> @@ -42,6 +39,9 @@ CONFIG_UNIX=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_XFRM_MODE_TRANSPORT is not set
>   # CONFIG_INET_XFRM_MODE_TUNNEL is not set
>   # CONFIG_INET_XFRM_MODE_BEET is not set
> @@ -51,7 +51,8 @@ CONFIG_IPV6=y
>   # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
>   # CONFIG_INET6_XFRM_MODE_BEET is not set
>   CONFIG_IPV6_SIT_6RD=y
> -# CONFIG_WIRELESS is not set
> +CONFIG_CFG80211=y
> +CONFIG_MAC80211=y
>   CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>   CONFIG_DEVTMPFS=y
>   CONFIG_DEVTMPFS_MOUNT=y
> @@ -72,7 +73,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4
>   CONFIG_BLK_DEV_RAM_SIZE=8192
>   CONFIG_ATMEL_PWM=y
>   CONFIG_ATMEL_TCLIB=y
> -CONFIG_EEPROM_93CX6=m
>   CONFIG_SCSI=y
>   CONFIG_BLK_DEV_SD=y
>   CONFIG_SCSI_MULTI_LUN=y
> @@ -81,7 +81,6 @@ CONFIG_NETDEVICES=y
>   CONFIG_MII=y
>   CONFIG_MACB=y
>   # CONFIG_NET_VENDOR_BROADCOM is not set
> -# CONFIG_NET_VENDOR_CHELSIO is not set
>   # CONFIG_NET_VENDOR_FARADAY is not set
>   # CONFIG_NET_VENDOR_INTEL is not set
>   # CONFIG_NET_VENDOR_MARVELL is not set
> @@ -92,7 +91,23 @@ CONFIG_MACB=y
>   # CONFIG_NET_VENDOR_STMICRO is not set
>   CONFIG_DAVICOM_PHY=y
>   CONFIG_MICREL_PHY=y
> -# CONFIG_WLAN is not set
> +CONFIG_RTL8187=m
> +CONFIG_LIBERTAS=m
> +CONFIG_LIBERTAS_SDIO=m
> +CONFIG_LIBERTAS_SPI=m
> +CONFIG_RT2X00=m
> +CONFIG_RT2500USB=m
> +CONFIG_RT73USB=m
> +CONFIG_RT2800USB=m
> +CONFIG_RT2800USB_RT53XX=y
> +CONFIG_RT2800USB_RT55XX=y
> +CONFIG_RT2800USB_UNKNOWN=y
> +CONFIG_RTLWIFI=m
> +# CONFIG_RTLWIFI_DEBUG is not set
> +CONFIG_RTL8192CU=m
> +CONFIG_MWIFIEX=m
> +CONFIG_MWIFIEX_SDIO=m
> +CONFIG_MWIFIEX_USB=m
>   CONFIG_INPUT_POLLDEV=y
>   # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
>   CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
> @@ -112,13 +127,11 @@ CONFIG_I2C=y
>   CONFIG_I2C_GPIO=y
>   CONFIG_SPI=y
>   CONFIG_SPI_ATMEL=y
> -CONFIG_PINCTRL_AT91=y
>   # CONFIG_HWMON is not set
>   CONFIG_WATCHDOG=y
>   CONFIG_AT91SAM9X_WATCHDOG=y
>   CONFIG_SSB=m
>   CONFIG_FB=y
> -CONFIG_FB_MODE_HELPERS=y
>   CONFIG_FB_ATMEL=y
>   CONFIG_BACKLIGHT_LCD_SUPPORT=y
>   # CONFIG_LCD_CLASS_DEVICE is not set
> @@ -132,11 +145,8 @@ CONFIG_FONT_8x8=y
>   CONFIG_FONT_ACORN_8x8=y
>   CONFIG_FONT_MINI_4x6=y
>   CONFIG_LOGO=y
> -# CONFIG_HID_SUPPORT is not set
>   CONFIG_USB=y
>   CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
> -CONFIG_USB_DEVICEFS=y
> -# CONFIG_USB_DEVICE_CLASS is not set
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_OHCI_HCD=y
>   CONFIG_USB_ACM=y
> @@ -146,14 +156,9 @@ CONFIG_USB_SERIAL_GENERIC=y
>   CONFIG_USB_SERIAL_FTDI_SIO=y
>   CONFIG_USB_SERIAL_PL2303=y
>   CONFIG_USB_GADGET=y
> -CONFIG_USB_AT91=m
> -CONFIG_USB_ATMEL_USBA=m
> -CONFIG_USB_ETH=m
> -CONFIG_USB_GADGETFS=m
> -CONFIG_USB_CDC_COMPOSITE=m
> -CONFIG_USB_G_ACM_MS=m
> -CONFIG_USB_G_MULTI=m
> -CONFIG_USB_G_MULTI_CDC=y
> +CONFIG_USB_AT91=y
> +CONFIG_USB_ATMEL_USBA=y
> +CONFIG_USB_G_SERIAL=y
>   CONFIG_MMC=y
>   CONFIG_MMC_ATMELMCI=y
>   CONFIG_NEW_LEDS=y
> @@ -168,16 +173,18 @@ CONFIG_RTC_DRV_AT91RM9200=y
>   CONFIG_RTC_DRV_AT91SAM9=y
>   CONFIG_DMADEVICES=y
>   # CONFIG_IOMMU_SUPPORT is not set
> -CONFIG_EXT2_FS=y
> +CONFIG_EXT4_FS=y
>   CONFIG_FANOTIFY=y
>   CONFIG_VFAT_FS=y
>   CONFIG_TMPFS=y
> +CONFIG_UBIFS_FS=y
> +CONFIG_UBIFS_FS_ADVANCED_COMPR=y
>   CONFIG_NFS_FS=y
> -CONFIG_NFS_V3=y
>   CONFIG_ROOT_NFS=y
>   CONFIG_NLS_CODEPAGE_437=y
>   CONFIG_NLS_CODEPAGE_850=y
>   CONFIG_NLS_ISO8859_1=y
> +CONFIG_NLS_UTF8=y
>   CONFIG_STRIP_ASM_SYMS=y
>   CONFIG_DEBUG_FS=y
>   # CONFIG_SCHED_DEBUG is not set
> @@ -192,7 +199,7 @@ CONFIG_CRYPTO_ARC4=y
>   CONFIG_CRYPTO_USER_API_HASH=m
>   CONFIG_CRYPTO_USER_API_SKCIPHER=m
>   # CONFIG_CRYPTO_HW is not set
> -CONFIG_CRC_CCITT=m
> -CONFIG_CRC_ITU_T=m
> +CONFIG_CRC_CCITT=y
> +CONFIG_CRC_ITU_T=y
>   CONFIG_CRC7=m
>   CONFIG_AVERAGE=y
> diff --git a/arch/arm/configs/at91rm9200_defconfig b/arch/arm/configs/at91rm9200_defconfig
> index 4ae57a3..8b09934 100644
> --- a/arch/arm/configs/at91rm9200_defconfig
> +++ b/arch/arm/configs/at91rm9200_defconfig
> @@ -1,10 +1,12 @@
> -CONFIG_EXPERIMENTAL=y
>   # CONFIG_LOCALVERSION_AUTO is not set
>   # CONFIG_SWAP is not set
>   CONFIG_SYSVIPC=y
> +CONFIG_NO_HZ=y
> +CONFIG_HIGH_RES_TIMERS=y
>   CONFIG_IKCONFIG=y
>   CONFIG_IKCONFIG_PROC=y
>   CONFIG_LOG_BUF_SHIFT=14
> +CONFIG_USER_NS=y
>   CONFIG_BLK_DEV_INITRD=y
>   CONFIG_MODULES=y
>   CONFIG_MODULE_FORCE_LOAD=y
> @@ -35,49 +37,37 @@ CONFIG_AT91_TIMER_HZ=100
>   # CONFIG_ARM_THUMB is not set
>   CONFIG_PCCARD=y
>   CONFIG_AT91_CF=y
> -CONFIG_NO_HZ=y
> -CONFIG_HIGH_RES_TIMERS=y
> -CONFIG_PREEMPT=y
>   CONFIG_AEABI=y
> -CONFIG_LEDS=y
> -CONFIG_LEDS_CPU=y
> +# CONFIG_COMPACTION is not set
>   CONFIG_ZBOOT_ROM_TEXT=0x10000000
>   CONFIG_ZBOOT_ROM_BSS=0x20040000
>   CONFIG_KEXEC=y
> +CONFIG_AUTO_ZRELADDR=y
>   CONFIG_FPE_NWFPE=y
>   CONFIG_BINFMT_MISC=y
>   CONFIG_NET=y
>   CONFIG_PACKET=y
>   CONFIG_UNIX=y
> -CONFIG_XFRM_USER=m
>   CONFIG_INET=y
>   CONFIG_IP_MULTICAST=y
>   CONFIG_IP_PNP=y
>   CONFIG_IP_PNP_DHCP=y
>   CONFIG_IP_PNP_BOOTP=y
> -CONFIG_NET_IPIP=m
> -CONFIG_INET_AH=m
> -CONFIG_INET_ESP=m
> -CONFIG_INET_IPCOMP=m
> -CONFIG_INET_XFRM_MODE_TRANSPORT=m
> -CONFIG_INET_XFRM_MODE_TUNNEL=m
> -CONFIG_INET_XFRM_MODE_BEET=m
> +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
> +# CONFIG_INET_XFRM_MODE_TUNNEL is not set
> +# CONFIG_INET_XFRM_MODE_BEET is not set
> +# CONFIG_INET_DIAG is not set
> +CONFIG_IPV6=y
>   CONFIG_IPV6_PRIVACY=y
>   CONFIG_IPV6_ROUTER_PREF=y
>   CONFIG_IPV6_ROUTE_INFO=y
> -CONFIG_INET6_AH=m
> -CONFIG_INET6_ESP=m
> -CONFIG_INET6_IPCOMP=m
> -CONFIG_IPV6_MIP6=m
> -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
> -CONFIG_IPV6_TUNNEL=m
> -CONFIG_BRIDGE=m
> -CONFIG_VLAN_8021Q=m
> -CONFIG_BT=m
>   CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
> +CONFIG_DEVTMPFS=y
> +CONFIG_DEVTMPFS_MOUNT=y
> +# CONFIG_STANDALONE is not set
> +# CONFIG_PREVENT_FIRMWARE_BUILD is not set
>   CONFIG_MTD=y
>   CONFIG_MTD_CMDLINE_PARTS=y
> -CONFIG_MTD_AFS_PARTS=y
>   CONFIG_MTD_CHAR=y
>   CONFIG_MTD_BLOCK=y
>   CONFIG_MTD_CFI=y
> @@ -94,55 +84,21 @@ CONFIG_MTD_NAND_PLATFORM=y
>   CONFIG_MTD_UBI=y
>   CONFIG_MTD_UBI_GLUEBI=y
>   CONFIG_BLK_DEV_LOOP=y
> -CONFIG_BLK_DEV_NBD=y
>   CONFIG_BLK_DEV_RAM=y
>   CONFIG_BLK_DEV_RAM_SIZE=8192
> -CONFIG_SCSI=y
> -CONFIG_BLK_DEV_SD=y
> -CONFIG_BLK_DEV_SR=m
> -CONFIG_BLK_DEV_SR_VENDOR=y
> -CONFIG_CHR_DEV_SG=m
> -CONFIG_SCSI_MULTI_LUN=y
> -# CONFIG_SCSI_LOWLEVEL is not set
>   CONFIG_NETDEVICES=y
> -CONFIG_TUN=m
> +CONFIG_MII=y
>   CONFIG_ARM_AT91_ETHER=y
> -CONFIG_PHYLIB=y
>   CONFIG_DAVICOM_PHY=y
>   CONFIG_SMSC_PHY=y
>   CONFIG_MICREL_PHY=y
> -CONFIG_PPP=y
> -CONFIG_PPP_BSDCOMP=y
> -CONFIG_PPP_DEFLATE=y
> -CONFIG_PPP_FILTER=y
> -CONFIG_PPP_MPPE=m
> -CONFIG_PPP_MULTILINK=y
> -CONFIG_PPPOE=m
> -CONFIG_PPP_ASYNC=y
> -CONFIG_SLIP=m
> -CONFIG_SLIP_COMPRESSED=y
> -CONFIG_SLIP_SMART=y
> -CONFIG_SLIP_MODE_SLIP6=y
> -CONFIG_USB_CATC=m
> -CONFIG_USB_KAWETH=m
> -CONFIG_USB_PEGASUS=m
> -CONFIG_USB_RTL8150=m
> -CONFIG_USB_USBNET=m
> -CONFIG_USB_NET_DM9601=m
> -CONFIG_USB_NET_GL620A=m
> -CONFIG_USB_NET_PLUSB=m
> -CONFIG_USB_NET_RNDIS_HOST=m
> -CONFIG_USB_ALI_M5632=y
> -CONFIG_USB_AN2720=y
> -CONFIG_USB_EPSON2888=y
> -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
> -CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
> -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
> +# CONFIG_WLAN is not set
> +# CONFIG_INPUT_MOUSEDEV is not set
>   CONFIG_INPUT_EVDEV=y
>   CONFIG_KEYBOARD_GPIO=y
>   # CONFIG_INPUT_MOUSE is not set
>   CONFIG_INPUT_TOUCHSCREEN=y
> -CONFIG_LEGACY_PTY_COUNT=32
> +# CONFIG_LEGACY_PTYS is not set
>   CONFIG_SERIAL_ATMEL=y
>   CONFIG_SERIAL_ATMEL_CONSOLE=y
>   CONFIG_HW_RANDOM=y
> @@ -151,38 +107,8 @@ CONFIG_I2C_CHARDEV=y
>   CONFIG_I2C_GPIO=y
>   CONFIG_SPI=y
>   CONFIG_SPI_ATMEL=y
> -CONFIG_SPI_BITBANG=y
>   CONFIG_GPIO_SYSFS=y
> -CONFIG_HWMON=m
> -CONFIG_SENSORS_ADM1021=m
> -CONFIG_SENSORS_ADM1025=m
> -CONFIG_SENSORS_ADM1026=m
> -CONFIG_SENSORS_ADM1029=m
> -CONFIG_SENSORS_ADM1031=m
> -CONFIG_SENSORS_ADM9240=m
> -CONFIG_SENSORS_DS1621=m
> -CONFIG_SENSORS_GL518SM=m
> -CONFIG_SENSORS_GL520SM=m
> -CONFIG_SENSORS_IT87=m
> -CONFIG_SENSORS_LM63=m
> -CONFIG_SENSORS_LM73=m
> -CONFIG_SENSORS_LM75=m
> -CONFIG_SENSORS_LM77=m
> -CONFIG_SENSORS_LM78=m
> -CONFIG_SENSORS_LM80=m
> -CONFIG_SENSORS_LM83=m
> -CONFIG_SENSORS_LM85=m
> -CONFIG_SENSORS_LM87=m
> -CONFIG_SENSORS_LM90=m
> -CONFIG_SENSORS_LM92=m
> -CONFIG_SENSORS_MAX1619=m
> -CONFIG_SENSORS_PCF8591=m
> -CONFIG_SENSORS_SMSC47B397=m
> -CONFIG_SENSORS_W83781D=m
> -CONFIG_SENSORS_W83791D=m
> -CONFIG_SENSORS_W83792D=m
> -CONFIG_SENSORS_W83793=m
> -CONFIG_SENSORS_W83L785TS=m
> +# CONFIG_HWMON is not set
>   CONFIG_WATCHDOG=y
>   CONFIG_WATCHDOG_NOWAYOUT=y
>   CONFIG_AT91RM9200_WATCHDOG=y
> @@ -194,43 +120,14 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
>   CONFIG_LCD_CLASS_DEVICE=y
>   CONFIG_BACKLIGHT_CLASS_DEVICE=y
>   # CONFIG_BACKLIGHT_GENERIC is not set
> -CONFIG_DISPLAY_SUPPORT=y
>   CONFIG_FRAMEBUFFER_CONSOLE=y
>   CONFIG_FONTS=y
> -CONFIG_FONT_MINI_4x6=y
>   CONFIG_LOGO=y
> -# CONFIG_LOGO_LINUX_MONO is not set
> -# CONFIG_LOGO_LINUX_VGA16 is not set
>   CONFIG_USB=y
> -CONFIG_USB_DEVICEFS=y
> -# CONFIG_USB_DEVICE_CLASS is not set
> -CONFIG_USB_MON=y
>   CONFIG_USB_OHCI_HCD=y
> -CONFIG_USB_ACM=m
> -CONFIG_USB_PRINTER=m
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_SERIAL=y
> -CONFIG_USB_SERIAL_CONSOLE=y
> -CONFIG_USB_SERIAL_GENERIC=y
> -CONFIG_USB_SERIAL_FTDI_SIO=y
> -CONFIG_USB_SERIAL_KEYSPAN=y
> -CONFIG_USB_SERIAL_KEYSPAN_MPR=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA28=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA19=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
> -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
> -CONFIG_USB_SERIAL_MCT_U232=y
> -CONFIG_USB_SERIAL_PL2303=y
>   CONFIG_USB_GADGET=y
> -CONFIG_USB_ETH=m
> -CONFIG_USB_MASS_STORAGE=m
> +CONFIG_USB_AT91=y
> +CONFIG_USB_G_SERIAL=y
>   CONFIG_MMC=y
>   CONFIG_MMC_ATMELMCI=y
>   CONFIG_NEW_LEDS=y
> @@ -240,84 +137,27 @@ CONFIG_LEDS_TRIGGERS=y
>   CONFIG_LEDS_TRIGGER_TIMER=y
>   CONFIG_LEDS_TRIGGER_HEARTBEAT=y
>   CONFIG_LEDS_TRIGGER_GPIO=y
> -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
>   CONFIG_RTC_CLASS=y
> -# CONFIG_RTC_HCTOSYS is not set
> -CONFIG_RTC_DRV_DS1307=y
> -CONFIG_RTC_DRV_PCF8563=y
>   CONFIG_RTC_DRV_AT91RM9200=y
> -CONFIG_EXT2_FS=y
> -CONFIG_EXT2_FS_XATTR=y
> -CONFIG_EXT3_FS=y
> -# CONFIG_EXT3_FS_XATTR is not set
> -CONFIG_REISERFS_FS=y
> +CONFIG_EXT4_FS=y
>   CONFIG_AUTOFS4_FS=y
> -CONFIG_ISO9660_FS=y
> -CONFIG_JOLIET=y
> -CONFIG_ZISOFS=y
> -CONFIG_UDF_FS=y
> -CONFIG_MSDOS_FS=y
>   CONFIG_VFAT_FS=y
> -CONFIG_NTFS_FS=m
>   CONFIG_TMPFS=y
> -CONFIG_CONFIGFS_FS=y
> -CONFIG_JFFS2_FS=y
> -CONFIG_JFFS2_SUMMARY=y
> -CONFIG_JFFS2_COMPRESSION_OPTIONS=y
> -CONFIG_JFFS2_LZO=y
> -CONFIG_JFFS2_RUBIN=y
> -CONFIG_CRAMFS=y
> -CONFIG_MINIX_FS=y
> +CONFIG_UBIFS_FS=y
> +CONFIG_UBIFS_FS_ADVANCED_COMPR=y
>   CONFIG_NFS_FS=y
> -CONFIG_NFS_V3=y
> -CONFIG_NFS_V3_ACL=y
> -CONFIG_NFS_V4=y
>   CONFIG_ROOT_NFS=y
> -CONFIG_NFSD=y
> -CONFIG_CIFS=m
> -CONFIG_PARTITION_ADVANCED=y
> -CONFIG_MAC_PARTITION=y
>   CONFIG_NLS_CODEPAGE_437=y
> -CONFIG_NLS_CODEPAGE_737=m
> -CONFIG_NLS_CODEPAGE_775=m
> -CONFIG_NLS_CODEPAGE_850=m
> -CONFIG_NLS_CODEPAGE_852=m
> -CONFIG_NLS_CODEPAGE_855=m
> -CONFIG_NLS_CODEPAGE_857=m
> -CONFIG_NLS_CODEPAGE_860=m
> -CONFIG_NLS_CODEPAGE_861=m
> -CONFIG_NLS_CODEPAGE_862=m
> -CONFIG_NLS_CODEPAGE_863=m
> -CONFIG_NLS_CODEPAGE_864=m
> -CONFIG_NLS_CODEPAGE_865=m
> -CONFIG_NLS_CODEPAGE_866=m
> -CONFIG_NLS_CODEPAGE_869=m
> -CONFIG_NLS_CODEPAGE_936=m
> -CONFIG_NLS_CODEPAGE_950=m
> -CONFIG_NLS_CODEPAGE_932=m
> -CONFIG_NLS_CODEPAGE_949=m
> -CONFIG_NLS_CODEPAGE_874=m
> -CONFIG_NLS_ISO8859_8=m
> -CONFIG_NLS_CODEPAGE_1250=m
> -CONFIG_NLS_CODEPAGE_1251=m
> -CONFIG_NLS_ASCII=m
> +CONFIG_NLS_CODEPAGE_850=y
>   CONFIG_NLS_ISO8859_1=y
> -CONFIG_NLS_ISO8859_2=m
> -CONFIG_NLS_ISO8859_3=m
> -CONFIG_NLS_ISO8859_4=m
> -CONFIG_NLS_ISO8859_5=m
> -CONFIG_NLS_ISO8859_6=m
> -CONFIG_NLS_ISO8859_7=m
> -CONFIG_NLS_ISO8859_9=m
> -CONFIG_NLS_ISO8859_13=m
> -CONFIG_NLS_ISO8859_14=m
> -CONFIG_NLS_ISO8859_15=m
> -CONFIG_NLS_KOI8_R=m
> -CONFIG_NLS_KOI8_U=m
>   CONFIG_NLS_UTF8=y
>   CONFIG_MAGIC_SYSRQ=y
>   CONFIG_DEBUG_FS=y
>   CONFIG_DEBUG_KERNEL=y
>   # CONFIG_FTRACE is not set
> +CONFIG_DEBUG_USER=y
> +CONFIG_DEBUG_LL=y
> +CONFIG_EARLY_PRINTK=y
>   CONFIG_CRYPTO_PCBC=y
>   CONFIG_CRYPTO_SHA1=y
> +CONFIG_XZ_DEC_ARMTHUMB=y
> diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9260_9g20_defconfig
> similarity index 67%
> rename from arch/arm/configs/at91sam9g20_defconfig
> rename to arch/arm/configs/at91sam9260_9g20_defconfig
> index 892e828..f50c404 100644
> --- a/arch/arm/configs/at91sam9g20_defconfig
> +++ b/arch/arm/configs/at91sam9260_9g20_defconfig
> @@ -1,4 +1,3 @@
> -CONFIG_EXPERIMENTAL=y
>   # CONFIG_LOCALVERSION_AUTO is not set
>   # CONFIG_SWAP is not set
>   CONFIG_SYSVIPC=y
> @@ -11,7 +10,15 @@ CONFIG_MODULE_UNLOAD=y
>   # CONFIG_IOSCHED_DEADLINE is not set
>   # CONFIG_IOSCHED_CFQ is not set
>   CONFIG_ARCH_AT91=y
> -CONFIG_ARCH_AT91SAM9G20=y
> +CONFIG_ARCH_AT91SAM9260=y
> +CONFIG_MACH_AT91SAM9260EK=y
> +CONFIG_MACH_CAM60=y
> +CONFIG_MACH_SAM9_L9260=y
> +CONFIG_MACH_AFEB9260=y
> +CONFIG_MACH_USB_A9260=y
> +CONFIG_MACH_QIL_A9260=y
> +CONFIG_MACH_CPU9260=y
> +CONFIG_MACH_FLEXIBITY=y
>   CONFIG_MACH_AT91SAM9G20EK=y
>   CONFIG_MACH_AT91SAM9G20EK_2MMC=y
>   CONFIG_MACH_CPU9G20=y
> @@ -20,10 +27,10 @@ CONFIG_MACH_PORTUXG20=y
>   CONFIG_MACH_STAMP9G20=y
>   CONFIG_MACH_PCONTROL_G20=y
>   CONFIG_MACH_GSIA18S=y
> -CONFIG_MACH_USB_A9G20=y
>   CONFIG_MACH_SNAPPER_9260=y
>   CONFIG_MACH_AT91SAM9_DT=y
>   CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
> +CONFIG_AT91_SLOW_CLOCK=y
>   # CONFIG_ARM_THUMB is not set
>   CONFIG_AEABI=y
>   CONFIG_LEDS=y
> @@ -33,12 +40,14 @@ CONFIG_ZBOOT_ROM_BSS=0x0
>   CONFIG_ARM_APPENDED_DTB=y
>   CONFIG_ARM_ATAG_DTB_COMPAT=y
>   CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
> +CONFIG_AUTO_ZRELADDR=y
>   CONFIG_FPE_NWFPE=y
>   CONFIG_NET=y
>   CONFIG_PACKET=y
>   CONFIG_UNIX=y
>   CONFIG_INET=y
>   CONFIG_IP_PNP=y
> +CONFIG_IP_PNP_DHCP=y
>   CONFIG_IP_PNP_BOOTP=y
>   # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
>   # CONFIG_INET_XFRM_MODE_TUNNEL is not set
> @@ -46,8 +55,11 @@ CONFIG_IP_PNP_BOOTP=y
>   # CONFIG_INET_LRO is not set
>   # CONFIG_IPV6 is not set
>   CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
> +CONFIG_DEVTMPFS=y
> +CONFIG_DEVTMPFS_MOUNT=y
>   CONFIG_MTD=y
>   CONFIG_MTD_CMDLINE_PARTS=y
> +CONFIG_MTD_OF_PARTS=y
>   CONFIG_MTD_CHAR=y
>   CONFIG_MTD_BLOCK=y
>   CONFIG_MTD_DATAFLASH=y
> @@ -56,6 +68,8 @@ CONFIG_MTD_NAND_ATMEL=y
>   CONFIG_BLK_DEV_LOOP=y
>   CONFIG_BLK_DEV_RAM=y
>   CONFIG_BLK_DEV_RAM_SIZE=8192
> +CONFIG_MISC_DEVICES=y
> +CONFIG_EEPROM_AT25=y
>   CONFIG_SCSI=y
>   CONFIG_BLK_DEV_SD=y
>   CONFIG_SCSI_MULTI_LUN=y
> @@ -63,23 +77,36 @@ CONFIG_SCSI_MULTI_LUN=y
>   CONFIG_NETDEVICES=y
>   CONFIG_MII=y
>   CONFIG_MACB=y
> +# CONFIG_NET_VENDOR_BROADCOM is not set
> +# CONFIG_NET_VENDOR_CHELSIO 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_SMSC_PHY=y
>   # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
> -CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
> -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
> -CONFIG_INPUT_EVDEV=y
> -# CONFIG_KEYBOARD_ATKBD is not set
>   CONFIG_KEYBOARD_GPIO=y
>   # CONFIG_INPUT_MOUSE is not set
> -CONFIG_LEGACY_PTY_COUNT=16
> +# CONFIG_SERIO is not set
>   CONFIG_SERIAL_ATMEL=y
>   CONFIG_SERIAL_ATMEL_CONSOLE=y
>   CONFIG_HW_RANDOM=y
>   CONFIG_I2C=y
> +CONFIG_I2C_CHARDEV=y
>   CONFIG_I2C_GPIO=y
>   CONFIG_SPI=y
>   CONFIG_SPI_ATMEL=y
>   CONFIG_SPI_SPIDEV=y
> +CONFIG_GPIO_SYSFS=y
>   # CONFIG_HWMON is not set
> +CONFIG_WATCHDOG=y
> +CONFIG_WATCHDOG_NOWAYOUT=y
> +CONFIG_AT91SAM9X_WATCHDOG=y
>   CONFIG_SOUND=y
>   CONFIG_SND=y
>   CONFIG_SND_SEQUENCER=y
> @@ -94,12 +121,11 @@ CONFIG_USB_MON=y
>   CONFIG_USB_OHCI_HCD=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_USB_GADGET=y
> -CONFIG_USB_ZERO=m
> -CONFIG_USB_GADGETFS=m
> -CONFIG_USB_MASS_STORAGE=m
> -CONFIG_USB_G_SERIAL=m
> +CONFIG_USB_AT91=y
> +CONFIG_USB_G_SERIAL=y
>   CONFIG_MMC=y
> -CONFIG_MMC_ATMELMCI=m
> +CONFIG_MMC_ATMELMCI=y
> +CONFIG_MMC_SPI=y
>   CONFIG_NEW_LEDS=y
>   CONFIG_LEDS_CLASS=y
>   CONFIG_LEDS_GPIO=y
> @@ -109,15 +135,12 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
>   CONFIG_RTC_CLASS=y
>   CONFIG_RTC_DRV_RV3029C2=y
>   CONFIG_RTC_DRV_AT91SAM9=y
> -CONFIG_EXT2_FS=y
> -CONFIG_MSDOS_FS=y
> +CONFIG_EXT4_FS=y
>   CONFIG_VFAT_FS=y
>   CONFIG_TMPFS=y
> -CONFIG_JFFS2_FS=y
> -CONFIG_JFFS2_SUMMARY=y
> -CONFIG_CRAMFS=y
> +CONFIG_UBIFS_FS=y
> +CONFIG_UBIFS_FS_ADVANCED_COMPR=y
>   CONFIG_NFS_FS=y
> -CONFIG_NFS_V3=y
>   CONFIG_ROOT_NFS=y
>   CONFIG_NLS_CODEPAGE_437=y
>   CONFIG_NLS_CODEPAGE_850=y
> @@ -125,3 +148,9 @@ CONFIG_NLS_ISO8859_1=y
>   CONFIG_NLS_ISO8859_15=y
>   CONFIG_NLS_UTF8=y
>   # CONFIG_ENABLE_WARN_DEPRECATED is not set
> +CONFIG_DEBUG_KERNEL=y
> +CONFIG_DEBUG_INFO=y
> +# CONFIG_FTRACE is not set
> +CONFIG_DEBUG_LL=y
> +CONFIG_AT91_DEBUG_LL_DBGU0=y
> +CONFIG_EARLY_PRINTK=y
> diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig
> deleted file mode 100644
> index 05618eb..0000000
> --- a/arch/arm/configs/at91sam9260_defconfig
> +++ /dev/null
> @@ -1,91 +0,0 @@
> -CONFIG_EXPERIMENTAL=y
> -# CONFIG_LOCALVERSION_AUTO is not set
> -# CONFIG_SWAP is not set
> -CONFIG_SYSVIPC=y
> -CONFIG_LOG_BUF_SHIFT=14
> -CONFIG_BLK_DEV_INITRD=y
> -CONFIG_SLAB=y
> -CONFIG_MODULES=y
> -CONFIG_MODULE_UNLOAD=y
> -# CONFIG_BLK_DEV_BSG is not set
> -# CONFIG_IOSCHED_DEADLINE is not set
> -# CONFIG_IOSCHED_CFQ is not set
> -CONFIG_ARCH_AT91=y
> -CONFIG_ARCH_AT91SAM9260=y
> -CONFIG_ARCH_AT91SAM9260_SAM9XE=y
> -CONFIG_MACH_AT91SAM9260EK=y
> -CONFIG_MACH_CAM60=y
> -CONFIG_MACH_SAM9_L9260=y
> -CONFIG_MACH_AFEB9260=y
> -CONFIG_MACH_USB_A9260=y
> -CONFIG_MACH_QIL_A9260=y
> -CONFIG_MACH_CPU9260=y
> -CONFIG_MACH_FLEXIBITY=y
> -CONFIG_MACH_SNAPPER_9260=y
> -CONFIG_MACH_AT91SAM9_DT=y
> -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
> -# CONFIG_ARM_THUMB is not set
> -CONFIG_ZBOOT_ROM_TEXT=0x0
> -CONFIG_ZBOOT_ROM_BSS=0x0
> -CONFIG_ARM_APPENDED_DTB=y
> -CONFIG_ARM_ATAG_DTB_COMPAT=y
> -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
> -CONFIG_FPE_NWFPE=y
> -CONFIG_NET=y
> -CONFIG_PACKET=y
> -CONFIG_UNIX=y
> -CONFIG_INET=y
> -CONFIG_IP_PNP=y
> -CONFIG_IP_PNP_BOOTP=y
> -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
> -# CONFIG_INET_XFRM_MODE_TUNNEL is not set
> -# CONFIG_INET_XFRM_MODE_BEET is not set
> -# CONFIG_INET_LRO is not set
> -# CONFIG_IPV6 is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
> -CONFIG_BLK_DEV_RAM=y
> -CONFIG_BLK_DEV_RAM_SIZE=8192
> -CONFIG_SCSI=y
> -CONFIG_BLK_DEV_SD=y
> -CONFIG_SCSI_MULTI_LUN=y
> -CONFIG_NETDEVICES=y
> -CONFIG_MII=y
> -CONFIG_MACB=y
> -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
> -# CONFIG_INPUT_KEYBOARD is not set
> -# CONFIG_INPUT_MOUSE is not set
> -# CONFIG_SERIO is not set
> -CONFIG_SERIAL_ATMEL=y
> -CONFIG_SERIAL_ATMEL_CONSOLE=y
> -# CONFIG_HW_RANDOM is not set
> -CONFIG_I2C=y
> -CONFIG_I2C_CHARDEV=y
> -CONFIG_I2C_GPIO=y
> -# CONFIG_HWMON is not set
> -CONFIG_WATCHDOG=y
> -CONFIG_WATCHDOG_NOWAYOUT=y
> -CONFIG_AT91SAM9X_WATCHDOG=y
> -# CONFIG_USB_HID is not set
> -CONFIG_USB=y
> -CONFIG_USB_DEVICEFS=y
> -CONFIG_USB_MON=y
> -CONFIG_USB_OHCI_HCD=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_STORAGE_DEBUG=y
> -CONFIG_USB_GADGET=y
> -CONFIG_USB_ZERO=m
> -CONFIG_USB_GADGETFS=m
> -CONFIG_USB_MASS_STORAGE=m
> -CONFIG_USB_G_SERIAL=m
> -CONFIG_RTC_CLASS=y
> -CONFIG_RTC_DRV_AT91SAM9=y
> -CONFIG_EXT2_FS=y
> -CONFIG_VFAT_FS=y
> -CONFIG_TMPFS=y
> -CONFIG_CRAMFS=y
> -CONFIG_NLS_CODEPAGE_437=y
> -CONFIG_NLS_CODEPAGE_850=y
> -CONFIG_NLS_ISO8859_1=y
> -CONFIG_DEBUG_KERNEL=y
> -CONFIG_DEBUG_USER=y
> -CONFIG_DEBUG_LL=y
> diff --git a/arch/arm/configs/at91sam9261_defconfig b/arch/arm/configs/at91sam9261_9g10_defconfig
> similarity index 91%
> rename from arch/arm/configs/at91sam9261_defconfig
> rename to arch/arm/configs/at91sam9261_9g10_defconfig
> index c87beb9..9d35cd8 100644
> --- a/arch/arm/configs/at91sam9261_defconfig
> +++ b/arch/arm/configs/at91sam9261_9g10_defconfig
> @@ -17,6 +17,7 @@ CONFIG_MODULE_UNLOAD=y
>   CONFIG_ARCH_AT91=y
>   CONFIG_ARCH_AT91SAM9261=y
>   CONFIG_MACH_AT91SAM9261EK=y
> +CONFIG_MACH_AT91SAM9G10EK=y
>   CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>   # CONFIG_ARM_THUMB is not set
>   CONFIG_AEABI=y
> @@ -38,11 +39,11 @@ CONFIG_IP_PNP_BOOTP=y
>   # CONFIG_INET_LRO is not set
>   # CONFIG_IPV6 is not set
>   CONFIG_CFG80211=y
> -CONFIG_LIB80211=y
>   CONFIG_MAC80211=y
>   CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
> +CONFIG_DEVTMPFS=y
> +CONFIG_DEVTMPFS_MOUNT=y
>   CONFIG_MTD=y
> -CONFIG_MTD_PARTITIONS=y
>   CONFIG_MTD_CMDLINE_PARTS=y
>   CONFIG_MTD_BLOCK=y
>   CONFIG_MTD_NAND=y
> @@ -51,17 +52,13 @@ CONFIG_MTD_UBI=y
>   CONFIG_MTD_UBI_GLUEBI=y
>   CONFIG_BLK_DEV_RAM=y
>   CONFIG_BLK_DEV_RAM_SIZE=8192
> -CONFIG_MISC_DEVICES=y
>   CONFIG_ATMEL_TCLIB=y
>   CONFIG_ATMEL_SSC=y
>   CONFIG_SCSI=y
>   CONFIG_BLK_DEV_SD=y
>   CONFIG_SCSI_MULTI_LUN=y
>   CONFIG_NETDEVICES=y
> -CONFIG_NET_ETHERNET=y
>   CONFIG_DM9000=y
> -# CONFIG_NETDEV_1000 is not set
> -# CONFIG_NETDEV_10000 is not set
>   CONFIG_USB_ZD1201=m
>   CONFIG_RTL8187=m
>   CONFIG_LIBERTAS=m
> @@ -118,15 +115,11 @@ CONFIG_SND_AT73C213=y
>   CONFIG_SND_USB_AUDIO=m
>   # CONFIG_USB_HID is not set
>   CONFIG_USB=y
> -CONFIG_USB_DEVICEFS=y
>   CONFIG_USB_OHCI_HCD=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_USB_GADGET=y
> -CONFIG_USB_ZERO=m
> -CONFIG_USB_ETH=m
> -CONFIG_USB_GADGETFS=m
> -CONFIG_USB_MASS_STORAGE=m
> -CONFIG_USB_G_SERIAL=m
> +CONFIG_USB_AT91=y
> +CONFIG_USB_G_SERIAL=y
>   CONFIG_MMC=y
>   CONFIG_MMC_ATMELMCI=m
>   CONFIG_NEW_LEDS=y
> @@ -147,12 +140,10 @@ CONFIG_SQUASHFS=y
>   CONFIG_SQUASHFS_LZO=y
>   CONFIG_SQUASHFS_XZ=y
>   CONFIG_NFS_FS=y
> -CONFIG_NFS_V3=y
>   CONFIG_ROOT_NFS=y
>   CONFIG_NLS_CODEPAGE_437=y
>   CONFIG_NLS_CODEPAGE_850=y
>   CONFIG_NLS_ISO8859_1=y
>   CONFIG_NLS_ISO8859_15=y
>   CONFIG_NLS_UTF8=y
> -CONFIG_FTRACE=y
>   CONFIG_CRC_CCITT=m
> diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig
> index 36fed66b..9d72ab6 100644
> --- a/arch/arm/configs/at91sam9263_defconfig
> +++ b/arch/arm/configs/at91sam9263_defconfig
> @@ -1,6 +1,4 @@
> -CONFIG_EXPERIMENTAL=y
>   # CONFIG_LOCALVERSION_AUTO is not set
> -CONFIG_KERNEL_LZMA=y
>   # CONFIG_SWAP is not set
>   CONFIG_SYSVIPC=y
>   CONFIG_IKCONFIG=y
> @@ -48,9 +46,11 @@ CONFIG_IP_PIMSM_V2=y
>   # CONFIG_INET_LRO is not set
>   # CONFIG_INET_DIAG is not set
>   CONFIG_IPV6=y
> +# CONFIG_WIRELESS is not set
>   CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
> +CONFIG_DEVTMPFS=y
> +CONFIG_DEVTMPFS_MOUNT=y
>   CONFIG_MTD=y
> -CONFIG_MTD_PARTITIONS=y
>   CONFIG_MTD_CMDLINE_PARTS=y
>   CONFIG_MTD_CHAR=y
>   CONFIG_MTD_BLOCK=y
> @@ -65,7 +65,6 @@ CONFIG_MTD_UBI_GLUEBI=y
>   CONFIG_BLK_DEV_LOOP=y
>   CONFIG_BLK_DEV_RAM=y
>   CONFIG_BLK_DEV_RAM_SIZE=8192
> -CONFIG_MISC_DEVICES=y
>   CONFIG_ATMEL_PWM=y
>   CONFIG_ATMEL_TCLIB=y
>   CONFIG_SCSI=y
> @@ -73,23 +72,18 @@ CONFIG_BLK_DEV_SD=y
>   CONFIG_SCSI_MULTI_LUN=y
>   CONFIG_NETDEVICES=y
>   CONFIG_MII=y
> -CONFIG_SMSC_PHY=y
> -CONFIG_NET_ETHERNET=y
>   CONFIG_MACB=y
> -# CONFIG_NETDEV_1000 is not set
> -# CONFIG_NETDEV_10000 is not set
> -CONFIG_USB_ZD1201=m
> +CONFIG_SMSC_PHY=y
> +# CONFIG_WLAN is not set
>   CONFIG_INPUT_POLLDEV=m
> -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
> -CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
> -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
> +# CONFIG_INPUT_MOUSEDEV is not set
>   CONFIG_INPUT_EVDEV=y
>   # CONFIG_KEYBOARD_ATKBD is not set
>   CONFIG_KEYBOARD_GPIO=y
>   # CONFIG_INPUT_MOUSE is not set
>   CONFIG_INPUT_TOUCHSCREEN=y
>   CONFIG_TOUCHSCREEN_ADS7846=y
> -CONFIG_LEGACY_PTY_COUNT=4
> +# CONFIG_LEGACY_PTYS is not set
>   CONFIG_SERIAL_ATMEL=y
>   CONFIG_SERIAL_ATMEL_CONSOLE=y
>   CONFIG_HW_RANDOM=y
> @@ -98,6 +92,7 @@ CONFIG_I2C_CHARDEV=y
>   CONFIG_I2C_GPIO=y
>   CONFIG_SPI=y
>   CONFIG_SPI_ATMEL=y
> +CONFIG_GPIO_SYSFS=y
>   # CONFIG_HWMON is not set
>   CONFIG_WATCHDOG=y
>   CONFIG_WATCHDOG_NOWAYOUT=y
> @@ -107,9 +102,9 @@ CONFIG_FB_ATMEL=y
>   CONFIG_BACKLIGHT_LCD_SUPPORT=y
>   CONFIG_LCD_CLASS_DEVICE=y
>   CONFIG_BACKLIGHT_CLASS_DEVICE=y
> -CONFIG_BACKLIGHT_ATMEL_LCDC=y
>   CONFIG_FRAMEBUFFER_CONSOLE=y
>   CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
> +CONFIG_FONTS=y
>   CONFIG_LOGO=y
>   CONFIG_SOUND=y
>   CONFIG_SND=y
> @@ -124,16 +119,12 @@ CONFIG_SND_ATMEL_AC97C=y
>   # CONFIG_SND_SPI is not set
>   CONFIG_SND_USB_AUDIO=m
>   CONFIG_USB=y
> -CONFIG_USB_DEVICEFS=y
>   CONFIG_USB_MON=y
>   CONFIG_USB_OHCI_HCD=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_USB_GADGET=y
> -CONFIG_USB_ZERO=m
> -CONFIG_USB_ETH=m
> -CONFIG_USB_GADGETFS=m
> -CONFIG_USB_MASS_STORAGE=m
> -CONFIG_USB_G_SERIAL=m
> +CONFIG_USB_ATMEL_USBA=y
> +CONFIG_USB_G_SERIAL=y
>   CONFIG_MMC=y
>   CONFIG_SDIO_UART=m
>   CONFIG_MMC_ATMELMCI=m
> @@ -145,22 +136,18 @@ CONFIG_LEDS_TRIGGERS=y
>   CONFIG_LEDS_TRIGGER_HEARTBEAT=y
>   CONFIG_RTC_CLASS=y
>   CONFIG_RTC_DRV_AT91SAM9=y
> -CONFIG_EXT2_FS=y
> -CONFIG_FUSE_FS=m
> +CONFIG_EXT4_FS=y
>   CONFIG_VFAT_FS=y
>   CONFIG_TMPFS=y
> -CONFIG_JFFS2_FS=y
>   CONFIG_UBIFS_FS=y
>   CONFIG_UBIFS_FS_ADVANCED_COMPR=y
> -CONFIG_CRAMFS=y
>   CONFIG_NFS_FS=y
> -CONFIG_NFS_V3=y
>   CONFIG_NFS_V3_ACL=y
>   CONFIG_NFS_V4=y
>   CONFIG_ROOT_NFS=y
>   CONFIG_NLS_CODEPAGE_437=y
>   CONFIG_NLS_CODEPAGE_850=y
>   CONFIG_NLS_ISO8859_1=y
> -CONFIG_FTRACE=y
> +CONFIG_NLS_UTF8=y
>   CONFIG_DEBUG_USER=y
>   CONFIG_XZ_DEC=y
> diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
> index 18964cd..08166cd 100644
> --- a/arch/arm/configs/at91sam9g45_defconfig
> +++ b/arch/arm/configs/at91sam9g45_defconfig
> @@ -1,4 +1,3 @@
> -CONFIG_EXPERIMENTAL=y
>   # CONFIG_LOCALVERSION_AUTO is not set
>   # CONFIG_SWAP is not set
>   CONFIG_SYSVIPC=y
> @@ -23,8 +22,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>   CONFIG_AT91_SLOW_CLOCK=y
>   CONFIG_AEABI=y
>   # CONFIG_OABI_COMPAT is not set
> -CONFIG_LEDS=y
> -CONFIG_LEDS_CPU=y
>   CONFIG_UACCESS_WITH_MEMCPY=y
>   CONFIG_ZBOOT_ROM_TEXT=0x0
>   CONFIG_ZBOOT_ROM_BSS=0x0
> @@ -36,6 +33,9 @@ CONFIG_PACKET=y
>   CONFIG_UNIX=y
>   CONFIG_INET=y
>   CONFIG_IP_MULTICAST=y
> +CONFIG_IP_PNP=y
> +CONFIG_IP_PNP_DHCP=y
> +CONFIG_IP_PNP_BOOTP=y
>   # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
>   # CONFIG_INET_XFRM_MODE_TUNNEL is not set
>   # CONFIG_INET_XFRM_MODE_BEET is not set
> @@ -45,9 +45,6 @@ CONFIG_IPV6=y
>   # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
>   # CONFIG_INET6_XFRM_MODE_BEET is not set
>   CONFIG_IPV6_SIT_6RD=y
> -CONFIG_CFG80211=y
> -CONFIG_LIB80211=y
> -CONFIG_MAC80211=y
>   CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>   CONFIG_DEVTMPFS=y
>   CONFIG_DEVTMPFS_MOUNT=y
> @@ -61,13 +58,14 @@ CONFIG_MTD_DATAFLASH=y
>   CONFIG_MTD_NAND=y
>   CONFIG_MTD_NAND_ATMEL=y
>   CONFIG_MTD_UBI=y
> +CONFIG_MTD_UBI_GLUEBI=y
>   CONFIG_BLK_DEV_LOOP=y
>   CONFIG_BLK_DEV_RAM=y
>   CONFIG_BLK_DEV_RAM_COUNT=4
>   CONFIG_BLK_DEV_RAM_SIZE=8192
> -CONFIG_MISC_DEVICES=y
>   CONFIG_ATMEL_PWM=y
>   CONFIG_ATMEL_TCLIB=y
> +CONFIG_ATMEL_SSC=y
>   CONFIG_SCSI=y
>   CONFIG_BLK_DEV_SD=y
>   CONFIG_SCSI_MULTI_LUN=y
> @@ -76,67 +74,40 @@ CONFIG_NETDEVICES=y
>   CONFIG_MII=y
>   CONFIG_MACB=y
>   CONFIG_DAVICOM_PHY=y
> -CONFIG_LIBERTAS_THINFIRM=m
> -CONFIG_LIBERTAS_THINFIRM_USB=m
> -CONFIG_AT76C50X_USB=m
> -CONFIG_USB_ZD1201=m
> -CONFIG_RTL8187=m
> -CONFIG_ATH_COMMON=m
> -CONFIG_ATH9K=m
> -CONFIG_CARL9170=m
> -CONFIG_B43=m
> -CONFIG_B43_PHY_N=y
> -CONFIG_LIBERTAS=m
> -CONFIG_LIBERTAS_USB=m
> -CONFIG_LIBERTAS_SDIO=m
> -CONFIG_LIBERTAS_SPI=m
> -CONFIG_RT2X00=m
> -CONFIG_RT2500USB=m
> -CONFIG_RT73USB=m
> -CONFIG_RT2800USB=m
> -CONFIG_RT2800USB_RT53XX=y
> -CONFIG_RT2800USB_UNKNOWN=y
> -CONFIG_RTL8192CU=m
> -CONFIG_WL1251=m
> -CONFIG_WL1251_SDIO=m
> -CONFIG_WL12XX_MENU=m
> -CONFIG_WL12XX=m
> -CONFIG_WL12XX_SDIO=m
> -CONFIG_ZD1211RW=m
> -CONFIG_MWIFIEX=m
> -CONFIG_MWIFIEX_SDIO=m
> -CONFIG_INPUT_POLLDEV=m
> -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
> -CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
> -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272
> +# CONFIG_INPUT_MOUSEDEV is not set
>   CONFIG_INPUT_JOYDEV=y
>   CONFIG_INPUT_EVDEV=y
>   # CONFIG_KEYBOARD_ATKBD is not set
> -CONFIG_KEYBOARD_QT1070=m
> -CONFIG_KEYBOARD_QT2160=m
> +CONFIG_KEYBOARD_QT1070=y
> +CONFIG_KEYBOARD_QT2160=y
>   CONFIG_KEYBOARD_GPIO=y
>   # CONFIG_INPUT_MOUSE is not set
>   CONFIG_INPUT_TOUCHSCREEN=y
>   CONFIG_TOUCHSCREEN_ATMEL_MXT=m
>   CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y
>   # CONFIG_SERIO is not set
> -CONFIG_LEGACY_PTY_COUNT=4
> +# CONFIG_LEGACY_PTYS is not set
>   CONFIG_SERIAL_ATMEL=y
>   CONFIG_SERIAL_ATMEL_CONSOLE=y
>   CONFIG_HW_RANDOM=y
>   CONFIG_I2C=y
> +CONFIG_I2C_CHARDEV=y
>   CONFIG_I2C_GPIO=y
>   CONFIG_SPI=y
>   CONFIG_SPI_ATMEL=y
>   # CONFIG_HWMON is not set
>   CONFIG_FB=y
>   CONFIG_FB_ATMEL=y
> -CONFIG_FB_UDL=m
>   CONFIG_BACKLIGHT_LCD_SUPPORT=y
> -# CONFIG_LCD_CLASS_DEVICE is not set
> +CONFIG_LCD_CLASS_DEVICE=y
>   CONFIG_BACKLIGHT_CLASS_DEVICE=y
>   CONFIG_BACKLIGHT_ATMEL_LCDC=y
> +CONFIG_BACKLIGHT_ATMEL_PWM=y
>   # CONFIG_BACKLIGHT_GENERIC is not set
> +CONFIG_FRAMEBUFFER_CONSOLE=y
> +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
> +CONFIG_FONTS=y
> +CONFIG_LOGO=y
>   CONFIG_SOUND=y
>   CONFIG_SND=y
>   CONFIG_SND_SEQUENCER=y
> @@ -148,33 +119,25 @@ CONFIG_SND_PCM_OSS=y
>   # CONFIG_SND_ARM is not set
>   CONFIG_SND_ATMEL_AC97C=y
>   # CONFIG_SND_SPI is not set
> -CONFIG_SND_USB_AUDIO=m
> +# CONFIG_SND_USB is not set
>   # CONFIG_USB_HID is not set
>   CONFIG_USB=y
>   CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
> -CONFIG_USB_DEVICEFS=y
> -# CONFIG_USB_DEVICE_CLASS is not set
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_OHCI_HCD=y
>   CONFIG_USB_ACM=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_USB_GADGET=y
> -CONFIG_USB_ATMEL_USBA=m
> -CONFIG_USB_ZERO=m
> -CONFIG_USB_AUDIO=m
> -CONFIG_USB_ETH=m
> -CONFIG_USB_ETH_EEM=y
> -CONFIG_USB_MASS_STORAGE=m
> -CONFIG_USB_G_SERIAL=m
> -CONFIG_USB_CDC_COMPOSITE=m
> -CONFIG_USB_G_MULTI=m
> +CONFIG_USB_ATMEL_USBA=y
> +CONFIG_USB_G_MULTI=y
>   CONFIG_USB_G_MULTI_CDC=y
>   CONFIG_MMC=y
>   # CONFIG_MMC_BLOCK_BOUNCE is not set
> -CONFIG_SDIO_UART=m
>   CONFIG_MMC_ATMELMCI=y
> -CONFIG_LEDS_ATMEL_PWM=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_HEARTBEAT=y
>   CONFIG_LEDS_TRIGGER_GPIO=y
> @@ -184,17 +147,14 @@ CONFIG_DMADEVICES=y
>   CONFIG_AT_HDMAC=y
>   CONFIG_DMATEST=m
>   # CONFIG_IOMMU_SUPPORT is not set
> -CONFIG_EXT2_FS=y
> +CONFIG_EXT4_FS=y
>   CONFIG_FANOTIFY=y
>   CONFIG_VFAT_FS=y
>   CONFIG_TMPFS=y
> -CONFIG_JFFS2_FS=y
> -CONFIG_JFFS2_SUMMARY=y
> -CONFIG_CRAMFS=m
> -CONFIG_SQUASHFS=m
> -CONFIG_SQUASHFS_EMBEDDED=y
> +CONFIG_UBIFS_FS=y
> +CONFIG_UBIFS_FS_ADVANCED_COMPR=y
>   CONFIG_NFS_FS=y
> -CONFIG_NFS_V3=y
> +CONFIG_ROOT_NFS=y
>   CONFIG_NLS_CODEPAGE_437=y
>   CONFIG_NLS_CODEPAGE_850=y
>   CONFIG_NLS_ISO8859_1=y
> @@ -203,6 +163,8 @@ CONFIG_STRIP_ASM_SYMS=y
>   CONFIG_DEBUG_MEMORY_INIT=y
>   # CONFIG_FTRACE is not set
>   CONFIG_DEBUG_USER=y
> +CONFIG_DEBUG_LL=y
> +CONFIG_EARLY_PRINTK=y
>   CONFIG_CRYPTO_ECB=y
>   # CONFIG_CRYPTO_ANSI_CPRNG is not set
>   CONFIG_CRYPTO_USER_API_HASH=m
> diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
> index 4d0dc3c..f6e78f8 100644
> --- a/arch/arm/configs/sama5_defconfig
> +++ b/arch/arm/configs/sama5_defconfig
> @@ -26,7 +26,9 @@ CONFIG_AEABI=y
>   CONFIG_UACCESS_WITH_MEMCPY=y
>   CONFIG_ZBOOT_ROM_TEXT=0x0
>   CONFIG_ZBOOT_ROM_BSS=0x0
> +CONFIG_ARM_APPENDED_DTB=y
>   CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
> +CONFIG_KEXEC=y
>   CONFIG_AUTO_ZRELADDR=y
>   CONFIG_VFP=y
>   # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
> @@ -39,6 +41,9 @@ CONFIG_UNIX=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_XFRM_MODE_TRANSPORT is not set
>   # CONFIG_INET_XFRM_MODE_TUNNEL is not set
>   # CONFIG_INET_XFRM_MODE_BEET is not set
> @@ -68,6 +73,8 @@ CONFIG_MTD_M25P80=y
>   CONFIG_MTD_NAND=y
>   CONFIG_MTD_NAND_ATMEL=y
>   CONFIG_MTD_UBI=y
> +CONFIG_MTD_UBI_GLUEBI=y
> +CONFIG_PROC_DEVICETREE=y
>   CONFIG_BLK_DEV_LOOP=y
>   CONFIG_BLK_DEV_RAM=y
>   CONFIG_BLK_DEV_RAM_COUNT=4
> @@ -95,7 +102,19 @@ CONFIG_MACB=y
>   # CONFIG_NET_VENDOR_STMICRO is not set
>   # CONFIG_NET_VENDOR_WIZNET is not set
>   CONFIG_MICREL_PHY=y
> -# CONFIG_WLAN is not set
> +CONFIG_LIBERTAS_THINFIRM=m
> +CONFIG_LIBERTAS_THINFIRM_USB=m
> +CONFIG_RTL8187=m
> +CONFIG_RT2X00=m
> +CONFIG_RT2500USB=m
> +CONFIG_RT73USB=m
> +CONFIG_RT2800USB=m
> +CONFIG_RT2800USB_RT53XX=y
> +CONFIG_RT2800USB_RT55XX=y
> +CONFIG_RT2800USB_UNKNOWN=y
> +CONFIG_MWIFIEX=m
> +CONFIG_MWIFIEX_SDIO=m
> +CONFIG_MWIFIEX_USB=m
>   # CONFIG_INPUT_MOUSEDEV is not set
>   CONFIG_INPUT_EVDEV=y
>   # CONFIG_KEYBOARD_ATKBD is not set
> @@ -133,9 +152,13 @@ CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_OHCI_HCD=y
>   CONFIG_USB_ACM=y
>   CONFIG_USB_STORAGE=y
> +CONFIG_USB_SERIAL=y
> +CONFIG_USB_SERIAL_GENERIC=y
> +CONFIG_USB_SERIAL_FTDI_SIO=y
> +CONFIG_USB_SERIAL_PL2303=y
>   CONFIG_USB_GADGET=y
> -CONFIG_USB_AT91=y
> -CONFIG_USB_MASS_STORAGE=m
> +CONFIG_USB_ATMEL_USBA=y
> +CONFIG_USB_G_SERIAL=y
>   CONFIG_MMC=y
>   # CONFIG_MMC_BLOCK_BOUNCE is not set
>   CONFIG_MMC_ATMELMCI=y
> @@ -151,18 +174,18 @@ CONFIG_DMADEVICES=y
>   # CONFIG_IOMMU_SUPPORT is not set
>   CONFIG_IIO=y
>   CONFIG_AT91_ADC=y
> -CONFIG_EXT2_FS=y
> +CONFIG_EXT4_FS=y
>   CONFIG_FANOTIFY=y
>   CONFIG_VFAT_FS=y
>   CONFIG_TMPFS=y
> -CONFIG_JFFS2_FS=y
> -CONFIG_JFFS2_SUMMARY=y
>   CONFIG_UBIFS_FS=y
> +CONFIG_UBIFS_FS_ADVANCED_COMPR=y
>   CONFIG_NFS_FS=y
>   CONFIG_ROOT_NFS=y
>   CONFIG_NLS_CODEPAGE_437=y
>   CONFIG_NLS_CODEPAGE_850=y
>   CONFIG_NLS_ISO8859_1=y
> +CONFIG_NLS_UTF8=y
>   CONFIG_STRIP_ASM_SYMS=y
>   CONFIG_DEBUG_FS=y
>   # CONFIG_SCHED_DEBUG is not set
> diff --git a/arch/arm/mach-at91/Kconfig.non_dt b/arch/arm/mach-at91/Kconfig.non_dt
> index 6c24985..1a2abd8 100644
> --- a/arch/arm/mach-at91/Kconfig.non_dt
> +++ b/arch/arm/mach-at91/Kconfig.non_dt
> @@ -14,15 +14,11 @@ config ARCH_AT91RM9200
>   	select SOC_AT91RM9200
>
>   config ARCH_AT91SAM9260
> -	bool "AT91SAM9260 or AT91SAM9XE"
> +	bool "AT91SAM9260 or AT91SAM9XE or AT91SAM9G20"
>   	select SOC_AT91SAM9260
>
>   config ARCH_AT91SAM9261
> -	bool "AT91SAM9261"
> -	select SOC_AT91SAM9261
> -
> -config ARCH_AT91SAM9G10
> -	bool "AT91SAM9G10"
> +	bool "AT91SAM9261 or AT91SAM9G10"
>   	select SOC_AT91SAM9261
>
>   config ARCH_AT91SAM9263
> @@ -33,10 +29,6 @@ config ARCH_AT91SAM9RL
>   	bool "AT91SAM9RL"
>   	select SOC_AT91SAM9RL
>
> -config ARCH_AT91SAM9G20
> -	bool "AT91SAM9G20"
> -	select SOC_AT91SAM9260
> -
>   config ARCH_AT91SAM9G45
>   	bool "AT91SAM9G45"
>   	select SOC_AT91SAM9G45
> @@ -50,6 +42,14 @@ config ARCH_AT91X40
>
>   endchoice
>
> +config ARCH_AT91SAM9G20
> +	bool
> +	select ARCH_AT91SAM9260
> +
> +config ARCH_AT91SAM9G10
> +	bool
> +	select ARCH_AT91SAM9261
> +
>   # ----------------------------------------------------------
>
>   if ARCH_AT91RM9200
> @@ -207,76 +207,6 @@ config MACH_FLEXIBITY
>   	  Select this if you are using Flexibity Connect board
>   	  <http://www.flexibity.com>
>
> -endif
> -
> -# ----------------------------------------------------------
> -
> -if ARCH_AT91SAM9261
> -
> -comment "AT91SAM9261 Board Type"
> -
> -config MACH_AT91SAM9261EK
> -	bool "Atmel AT91SAM9261-EK Evaluation Kit"
> -	select HAVE_AT91_DATAFLASH_CARD
> -	help
> -	  Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
> -	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
> -
> -endif
> -
> -# ----------------------------------------------------------
> -
> -if ARCH_AT91SAM9G10
> -
> -comment "AT91SAM9G10 Board Type"
> -
> -config MACH_AT91SAM9G10EK
> -	bool "Atmel AT91SAM9G10-EK Evaluation Kit"
> -	select HAVE_AT91_DATAFLASH_CARD
> -	help
> -	  Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
> -	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
> -
> -endif
> -
> -# ----------------------------------------------------------
> -
> -if ARCH_AT91SAM9263
> -
> -comment "AT91SAM9263 Board Type"
> -
> -config MACH_AT91SAM9263EK
> -	bool "Atmel AT91SAM9263-EK Evaluation Kit"
> -	select HAVE_AT91_DATAFLASH_CARD
> -	help
> -	  Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.
> -	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>
> -
> -config MACH_USB_A9263
> -	bool "CALAO USB-A9263"
> -	help
> -	  Select this if you are using a Calao Systems USB-A9263.
> -	  <http://www.calao-systems.com>
> -
> -endif
> -
> -# ----------------------------------------------------------
> -
> -if ARCH_AT91SAM9RL
> -
> -comment "AT91SAM9RL Board Type"
> -
> -config MACH_AT91SAM9RLEK
> -	bool "Atmel AT91SAM9RL-EK Evaluation Kit"
> -	help
> -	  Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.
> -
> -endif
> -
> -# ----------------------------------------------------------
> -
> -if ARCH_AT91SAM9G20
> -
>   comment "AT91SAM9G20 Board Type"
>
>   config MACH_AT91SAM9G20EK
> @@ -341,17 +271,70 @@ config MACH_USB_A9G20
>   	  Select this if you are using a Calao Systems USB-A9G20.
>   	  <http://www.calao-systems.com>
>
> +config MACH_SNAPPER_9260
> +	bool "Bluewater Systems Snapper 9260/9G20 module"
> +	help
> +	  Select this if you are using the Bluewater Systems Snapper 9260 or
> +	  Snapper 9G20 modules.
> +	  <http://www.bluewatersys.com/>
>   endif
>
> -if (ARCH_AT91SAM9260 || ARCH_AT91SAM9G20)
> -comment "AT91SAM9260/AT91SAM9G20 boards"
> +# ----------------------------------------------------------
> +
> +if ARCH_AT91SAM9261
> +
> +comment "AT91SAM9261 Board Type"
> +
> +config MACH_AT91SAM9261EK
> +	bool "Atmel AT91SAM9261-EK Evaluation Kit"
> +	select HAVE_AT91_DATAFLASH_CARD
> +	help
> +	  Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
> +	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
> +
> +comment "AT91SAM9G10 Board Type"
> +
> +config MACH_AT91SAM9G10EK
> +	bool "Atmel AT91SAM9G10-EK Evaluation Kit"
> +	select HAVE_AT91_DATAFLASH_CARD
> +	help
> +	  Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
> +	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
> +
> +endif
> +
> +# ----------------------------------------------------------
> +
> +if ARCH_AT91SAM9263
> +
> +comment "AT91SAM9263 Board Type"
> +
> +config MACH_AT91SAM9263EK
> +	bool "Atmel AT91SAM9263-EK Evaluation Kit"
> +	select HAVE_AT91_DATAFLASH_CARD
> +	help
> +	  Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.
> +	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>
> +
> +config MACH_USB_A9263
> +	bool "CALAO USB-A9263"
> +	help
> +	  Select this if you are using a Calao Systems USB-A9263.
> +	  <http://www.calao-systems.com>
> +
> +endif
> +
> +# ----------------------------------------------------------
> +
> +if ARCH_AT91SAM9RL
> +
> +comment "AT91SAM9RL Board Type"
> +
> +config MACH_AT91SAM9RLEK
> +	bool "Atmel AT91SAM9RL-EK Evaluation Kit"
> +	help
> +	  Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.
>
> -config MACH_SNAPPER_9260
> -        bool "Bluewater Systems Snapper 9260/9G20 module"
> -        help
> -          Select this if you are using the Bluewater Systems Snapper 9260 or
> -          Snapper 9G20 modules.
> -          <http://www.bluewatersys.com/>
>   endif
>
>   # ----------------------------------------------------------
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 788562d..f4a5f79 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -27,10 +27,8 @@ obj-$(CONFIG_SOC_SAMA5D3)	+= sama5d3.o
>   obj-$(CONFIG_ARCH_AT91RM9200)	+= at91rm9200_devices.o
>   obj-$(CONFIG_ARCH_AT91SAM9260)	+= at91sam9260_devices.o
>   obj-$(CONFIG_ARCH_AT91SAM9261)	+= at91sam9261_devices.o
> -obj-$(CONFIG_ARCH_AT91SAM9G10)	+= at91sam9261_devices.o
>   obj-$(CONFIG_ARCH_AT91SAM9263)	+= at91sam9263_devices.o
>   obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl_devices.o
> -obj-$(CONFIG_ARCH_AT91SAM9G20)	+= at91sam9260_devices.o
>   obj-$(CONFIG_ARCH_AT91SAM9G45)	+= at91sam9g45_devices.o
>   obj-$(CONFIG_ARCH_AT91X40)	+= at91x40.o at91x40_time.o
>
> diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
> index 9a6618a..473546b 100644
> --- a/arch/arm/mach-at91/board-sam9261ek.c
> +++ b/arch/arm/mach-at91/board-sam9261ek.c
> @@ -264,11 +264,7 @@ static void __init ek_add_device_ts(void) {}
>    */
>   static struct at73c213_board_info at73c213_data = {
>   	.ssc_id		= 1,
> -#if defined(CONFIG_MACH_AT91SAM9261EK)
> -	.shortname	= "AT91SAM9261-EK external DAC",
> -#else
> -	.shortname	= "AT91SAM9G10-EK external DAC",
> -#endif
> +	.shortname	= "AT91SAM9261/9G10-EK external DAC",
>   };
>
>   #if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
> @@ -412,9 +408,6 @@ static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {
>   	.default_monspecs		= &at91fb_default_stn_monspecs,
>   	.atmel_lcdfb_power_control	= at91_lcdc_stn_power_control,
>   	.guard_time			= 1,
> -#if defined(CONFIG_MACH_AT91SAM9G10EK)
> -	.lcd_wiring_mode		= ATMEL_LCDC_WIRING_RGB,
> -#endif
>   };
>
>   #else
> @@ -468,9 +461,6 @@ static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {
>   	.default_monspecs		= &at91fb_default_tft_monspecs,
>   	.atmel_lcdfb_power_control	= at91_lcdc_tft_power_control,
>   	.guard_time			= 1,
> -#if defined(CONFIG_MACH_AT91SAM9G10EK)
> -	.lcd_wiring_mode		= ATMEL_LCDC_WIRING_RGB,
> -#endif
>   };
>   #endif
>
> @@ -574,6 +564,10 @@ static void __init ek_board_init(void)
>   	/* DBGU on ttyS0. (Rx & Tx only) */
>   	at91_register_uart(0, 0, 0);
>   	at91_add_device_serial();
> +
> +	if (cpu_is_at91sam9g10())
> +		ek_lcdc_data.lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB;
> +
>   	/* USB Host */
>   	at91_add_device_usbh(&ek_usbh_data);
>   	/* USB Device */
> @@ -606,11 +600,17 @@ static void __init ek_board_init(void)
>   	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
>   }
>
> -#if defined(CONFIG_MACH_AT91SAM9261EK)
>   MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
> -#else
> +	/* Maintainer: Atmel */
> +	.init_time	= at91sam926x_pit_init,
> +	.map_io		= at91_map_io,
> +	.handle_irq	= at91_aic_handle_irq,
> +	.init_early	= ek_init_early,
> +	.init_irq	= at91_init_irq_default,
> +	.init_machine	= ek_board_init,
> +MACHINE_END
> +
>   MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
> -#endif
>   	/* Maintainer: Atmel */
>   	.init_time	= at91sam926x_pit_init,
>   	.map_io		= at91_map_io,
>


-- 
Nicolas Ferre