From ae117be24a6ae4cf9f246ed5bc16f259b0c31f0f Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Wed, 6 Nov 2013 01:13:14 +0400 Subject: [PATCH 1/2] update for new u-boot and OE --- classes/sdcard_image-a10.bbclass | 18 ++++++++++++++++++ recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb | 7 ++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/classes/sdcard_image-a10.bbclass b/classes/sdcard_image-a10.bbclass index ecb0b90..9d2922c 100644 --- a/classes/sdcard_image-a10.bbclass +++ b/classes/sdcard_image-a10.bbclass @@ -38,9 +38,27 @@ IMAGE_DEPENDS_a10-sdimg = " \ # Compile FEX file IMAGE_DEPENDS_a10-sdimg_olinuxino-a10s = " \ sunxi-board-fex \ + parted-native \ + mtools-native \ + dosfstools-native \ + virtual/kernel \ + virtual/bootloader \ " IMAGE_DEPENDS_a10-sdimg_cubieboard2 = " \ sunxi-board-fex \ + parted-native \ + mtools-native \ + dosfstools-native \ + virtual/kernel \ + virtual/bootloader \ + " +IMAGE_DEPENDS_a10-sdimg_cubieboard = " \ + sunxi-board-fex \ + parted-native \ + mtools-native \ + dosfstools-native \ + virtual/kernel \ + virtual/bootloader \ " # SD card image name diff --git a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb index 44eb767..881a033 100644 --- a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb +++ b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb @@ -4,14 +4,15 @@ DESCRIPTION = "Handler for Allwinner's FEX files" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1" DEPENDS = "sunxi-tools-native" -SRCREV = "4016ad7fb6c249c0bd6b6d804c706f9a7a165cc6" +SRCREV = "c9f031fb2d30101cda5a988c66715101bc3fea0b" PV = "1.0" -PR = "r1" +PR = "r3" SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git" S = "${WORKDIR}/git" SUNXI_FEX_FILE_olinuxino-a10s = "sys_config/a10s/a10s-olinuxino-m.fex" +SUNXI_FEX_FILE_cubieboard = "sys_config/a10/cubieboard.fex" SUNXI_FEX_FILE_cubieboard2 = "sys_config/a20/cubieboard2.fex" SUNXI_FEX_BIN_IMAGE = "fex-${MACHINE}-${PV}-${PR}.bin" @@ -47,4 +48,4 @@ do_populate_sysroot[noexec] = "1" # Remember to add machine entry to IMAGE_DEPENDS in sdcard_image-a10.bbclass # when adding new machines. -COMPATIBLE_MACHINE = "(olinuxino-a10s|cubieboard2)" +COMPATIBLE_MACHINE = "(olinuxino-a10s|cubieboard|cubieboard2)" From a3d83e799d9733ae7fdc8dc8ce0999696323e2fa Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Wed, 6 Nov 2013 09:12:00 +0400 Subject: [PATCH 2/2] cubieboard: updated defconfig --- .../linux/linux/cubieboard/defconfig | 58 ++++++------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/recipes-kernel/linux/linux/cubieboard/defconfig b/recipes-kernel/linux/linux/cubieboard/defconfig index 7fc615d..55d7d36 100644 --- a/recipes-kernel/linux/linux/cubieboard/defconfig +++ b/recipes-kernel/linux/linux/cubieboard/defconfig @@ -8,8 +8,6 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y -CONFIG_SPARSE_IRQ=y -CONFIG_TINY_RCU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 @@ -31,6 +29,18 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +CONFIG_MAC_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_SGI_PARTITION=y +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_ARCH_SUN4I=y CONFIG_SWP_EMULATE=y @@ -38,10 +48,13 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set CONFIG_HIGHMEM=y CONFIG_COMPACTION=y CONFIG_KSM=y -CONFIG_CMDLINE="mem=448M@0x40000000 console=ttyS0,115200" +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" debug" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y @@ -81,8 +94,6 @@ CONFIG_VLAN_8021Q=y CONFIG_VLAN_8021Q_GVRP=y CONFIG_NET_PKTGEN=m CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=y @@ -102,8 +113,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 -CONFIG_SUN4I_NANDFLASH=y -CONFIG_MISC_DEVICES=y CONFIG_SUNXI_DBGREG=m CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y @@ -114,16 +123,14 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SW_SATA_AHCI_PLATFORM=m CONFIG_NETDEVICES=y CONFIG_TUN=m +CONFIG_SUNXI_EMAC=m CONFIG_PHYLIB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_RTL8192CU_SW=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_USBNET=m CONFIG_USB_HSO=m CONFIG_USB_IPHETH=m -CONFIG_WEMAC_SUN4I=y +CONFIG_RTL8192CU_SW=m CONFIG_INPUT_FF_MEMLESS=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set @@ -133,7 +140,6 @@ CONFIG_INPUT_KEYRESET=y CONFIG_KEYBOARD_SUN4IKEYPAD=m CONFIG_KEYBOARD_SUN4I_KEYBOARD=m CONFIG_KEYBOARD_HV2605_KEYBOARD=m -CONFIG_IR_SUN4I=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GT801=m @@ -144,7 +150,6 @@ CONFIG_TOUCHSCREEN_FT5X_TS=m CONFIG_TOUCHSCREEN_ZT8031=m CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_NONSTANDARD=y # CONFIG_DEVKMEM is not set CONFIG_SERIAL_8250=y @@ -160,7 +165,6 @@ CONFIG_GPIO_SUNXI=m CONFIG_POWER_SUPPLY=y CONFIG_AW_AXP=y # CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y @@ -205,18 +209,10 @@ CONFIG_DRM=m CONFIG_DRM_MALI=m CONFIG_MALI=m CONFIG_FB=y -CONFIG_LYCHEE_FB_SUN4I=y -CONFIG_LYCHEE_LCD_SUN4I=y -CONFIG_LYCHEE_HDMI_SUN4I=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y -CONFIG_SOUND_SUN4I=y -CONFIG_SND_SUN4I_SOC_CODEC=y -CONFIG_SND_SUN4I_SOC_HDMIAUDIO=y -CONFIG_SND_SUN4I_SOC_SPDIF=m -CONFIG_SND_SUN4I_SOC_I2S_INTERFACE=m CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y @@ -236,13 +232,8 @@ CONFIG_USB_STORAGE_KARMA=y CONFIG_USB_STORAGE_CYPRESS_ATACB=y CONFIG_USB_STORAGE_ENE_UB6250=y CONFIG_USB_GADGET=y -CONFIG_USB_SW_SUN4I_UDC0=y CONFIG_USB_FILE_STORAGE=m CONFIG_USB_FILE_STORAGE_TEST=y -CONFIG_USB_SW_SUN4I_USB=y -CONFIG_USB_SW_SUN4I_USB_MANAGER=y -CONFIG_USB_SW_SUN4I_USB0_OTG=y -CONFIG_USB_SW_SUN4I_USB_DEBUG=y CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y # CONFIG_MMC_BLOCK_BOUNCE is not set @@ -257,7 +248,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_SUN4I=y CONFIG_STAGING=y -CONFIG_ZRAM=m CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS=y @@ -290,18 +280,6 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_CIFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_MAC_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_SGI_PARTITION=y -CONFIG_SUN_PARTITION=y -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_936=y