diff options
author | Jan Luebbe <jlu@pengutronix.de> | 2012-12-21 17:43:08 +0100 |
---|---|---|
committer | Jan Luebbe <jlu@pengutronix.de> | 2012-12-21 17:49:31 +0100 |
commit | fe3a84676ed4d7654e367318a3c11354a887b604 (patch) | |
tree | f7387280cbea5bc7da1c986f5c083e61e7d65639 | |
parent | 6c41f3c09f8ef60b4b3c5979f9ef6519ff9b3e12 (diff) | |
download | platform-pengutronix-vexpress-fe3a84676ed4d7654e367318a3c11354a887b604.tar.gz platform-pengutronix-vexpress-fe3a84676ed4d7654e367318a3c11354a887b604.tar.xz |
platformconfig: update to ptxdist release 2012.12.0
Also update to kernel 3.7.1 and switch to genimage.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
-rw-r--r-- | config/images/sd.config | 10 | ||||
-rw-r--r-- | kernelconfig (renamed from kernelconfig-3.5.4) | 201 | ||||
-rw-r--r-- | platformconfig | 69 | ||||
-rw-r--r-- | platforms/image-sd.in | 7 | ||||
-rw-r--r-- | rules/image-sd.make | 33 | ||||
-rwxr-xr-x | run | 4 |
6 files changed, 235 insertions, 89 deletions
diff --git a/config/images/sd.config b/config/images/sd.config new file mode 100644 index 0000000..867a196 --- /dev/null +++ b/config/images/sd.config @@ -0,0 +1,10 @@ +image @IMAGE@ { + hdimage { + align = 1M + } + size = 256M + partition root { + image = root.ext2 + partition-type = 0x83 + } +} diff --git a/kernelconfig-3.5.4 b/kernelconfig index db1c55f..2ae3ab6 100644 --- a/kernelconfig-3.5.4 +++ b/kernelconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.5.4 Kernel Configuration +# Linux/arm 3.7.1 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -41,9 +41,7 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y @@ -56,6 +54,7 @@ CONFIG_GENERIC_IRQ_SHOW=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_SPARSE_IRQ=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -68,6 +67,13 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y # CONFIG_HIGH_RES_TIMERS is not set # +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set + +# # RCU Subsystem # CONFIG_TREE_RCU=y @@ -97,7 +103,7 @@ CONFIG_NAMESPACES=y # CONFIG_NET_NS is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set -# CONFIG_RELAY is not set +CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_RD_GZIP=y @@ -109,6 +115,7 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y @@ -140,6 +147,7 @@ CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=y CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set @@ -156,6 +164,11 @@ CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_REL=y # # GCOV-based kernel profiling @@ -171,6 +184,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y # CONFIG_LBDAF is not set @@ -193,33 +207,11 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="deadline" -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y @@ -227,17 +219,16 @@ CONFIG_FREEZER=y # System Type # CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set -CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_BCMRING is not set -# CONFIG_ARCH_HIGHBANK is not set -# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_BCM2835 is not set # CONFIG_ARCH_CNS3XXX is not set +# CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_GEMINI is not set -# CONFIG_ARCH_PRIMA2 is not set +# CONFIG_ARCH_SIRF is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set @@ -251,15 +242,13 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set -# CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_MV78XX0 is not set # CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_MMP is not set # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_TEGRA is not set -# CONFIG_ARCH_PICOXCELL is not set -# CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_MSM is not set # CONFIG_ARCH_SHMOBILE is not set @@ -275,18 +264,33 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_U300 is not set # CONFIG_ARCH_U8500 is not set # CONFIG_ARCH_NOMADIK is not set +# CONFIG_PLAT_SPEAR is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_PLAT_SPEAR is not set # CONFIG_ARCH_VT8500 is not set # CONFIG_ARCH_ZYNQ is not set # +# Multiple platform selection +# + +# +# CPU Core family selection +# +# CONFIG_ARCH_MULTI_V6 is not set +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y +# CONFIG_ARCH_MULTI_CPU_AUTO is not set +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_HIGHBANK is not set +# CONFIG_ARCH_SOCFPGA is not set +CONFIG_ARCH_VEXPRESS=y + +# # Versatile Express platform type # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y CONFIG_ARCH_VEXPRESS_CA9X4=y -# CONFIG_ARCH_VEXPRESS_DT is not set CONFIG_PLAT_VERSATILE_CLCD=y CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y CONFIG_PLAT_VERSATILE=y @@ -315,6 +319,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set +# CONFIG_ARM_VIRT_EXT is not set # CONFIG_SWP_EMULATE is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set @@ -328,7 +333,6 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_NR_BANKS=8 -CONFIG_CPU_HAS_PMU=y CONFIG_MULTI_IRQ_HANDLER=y # CONFIG_ARM_ERRATA_430973 is not set # CONFIG_ARM_ERRATA_458693 is not set @@ -345,6 +349,7 @@ CONFIG_PL310_ERRATA_753970=y # CONFIG_ARM_ERRATA_754327 is not set # CONFIG_ARM_ERRATA_764369 is not set # CONFIG_PL310_ERRATA_769419 is not set +# CONFIG_ARM_ERRATA_775420 is not set CONFIG_ARM_GIC=y CONFIG_ICST=y @@ -353,7 +358,6 @@ CONFIG_ICST=y # CONFIG_ARM_AMBA=y # CONFIG_PCI_SYSCALL is not set -# CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCCARD is not set # @@ -409,24 +413,27 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set -# CONFIG_DEPRECATED_PARAM_STRUCT is not set +# CONFIG_XEN is not set # # Boot options # -# CONFIG_USE_OF is not set +CONFIG_USE_OF=y +CONFIG_ATAGS=y +# CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 +# CONFIG_ARM_APPENDED_DTB is not set CONFIG_CMDLINE="" -# CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set -# CONFIG_AUTO_ZRELADDR is not set +CONFIG_AUTO_ZRELADDR=y # # CPU Power Management # # CONFIG_CPU_IDLE is not set +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # # Floating point emulation @@ -450,6 +457,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_HAVE_AOUT=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set +CONFIG_COREDUMP=y # # Power management options @@ -474,6 +482,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y # CONFIG_UNIX_DIAG is not set CONFIG_XFRM=y @@ -493,6 +502,7 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set +# CONFIG_NET_IPVTI is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -518,7 +528,7 @@ CONFIG_IPV6=m # CONFIG_INET6_IPCOMP is not set # CONFIG_IPV6_MIP6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m @@ -526,7 +536,8 @@ CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_IPV6_SIT=m # CONFIG_IPV6_SIT_6RD is not set CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_MROUTE is not set # CONFIG_NETWORK_SECMARK is not set @@ -565,6 +576,7 @@ CONFIG_BQL=y # Network testing # # CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set @@ -600,12 +612,18 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_GENERIC_CPU_DEVICES is not set # CONFIG_DMA_SHARED_BUFFER is not set # CONFIG_CMA is not set + +# +# Bus devices +# +# CONFIG_OMAP_OCP2SCP is not set # CONFIG_CONNECTOR is not set CONFIG_MTD=y # CONFIG_MTD_TESTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_AFS_PARTS is not set +CONFIG_MTD_OF_PARTS=y # CONFIG_MTD_AR7_PARTS is not set # @@ -653,6 +671,7 @@ CONFIG_MTD_CFI_UTIL=y # # CONFIG_MTD_COMPLEX_MAPPINGS is not set # CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_PHYSMAP_OF is not set # CONFIG_MTD_PLATRAM is not set # @@ -675,6 +694,22 @@ CONFIG_MTD_CFI_UTIL=y # # CONFIG_MTD_LPDDR is not set # CONFIG_MTD_UBI is not set +CONFIG_DTC=y +CONFIG_OF=y + +# +# Device Tree and Open Firmware support +# +CONFIG_PROC_DEVICETREE=y +# CONFIG_OF_SELFTEST is not set +CONFIG_OF_FLATTREE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_DEVICE=y +CONFIG_OF_NET=y +CONFIG_OF_MDIO=y +CONFIG_OF_MTD=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set @@ -684,7 +719,6 @@ CONFIG_BLK_DEV=y # DRBD disabled because PROC_FS, INET or CONNECTOR not selected # # CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -703,7 +737,6 @@ CONFIG_BLK_DEV=y # EEPROM support # # CONFIG_EEPROM_93CX6 is not set -# CONFIG_IWMC3200TOP is not set # # Texas Instruments shared transport line discipline @@ -737,7 +770,6 @@ CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -771,6 +803,7 @@ CONFIG_ATA_BMDMA=y # # SATA SFF controllers with BMDMA # +# CONFIG_SATA_HIGHBANK is not set # CONFIG_SATA_MV is not set # @@ -795,6 +828,7 @@ CONFIG_NET_CORE=y CONFIG_MII=y # CONFIG_NET_TEAM is not set # CONFIG_MACVLAN is not set +# CONFIG_VXLAN is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -840,6 +874,7 @@ CONFIG_PHYLIB=y # # MII PHY device drivers # +# CONFIG_AT803X_PHY is not set # CONFIG_AMD_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -849,6 +884,7 @@ CONFIG_PHYLIB=y # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM87XX_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_REALTEK_PHY is not set # CONFIG_NATIONAL_PHY is not set @@ -857,6 +893,7 @@ CONFIG_PHYLIB=y # CONFIG_MICREL_PHY is not set # CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set +# CONFIG_MDIO_BUS_MUX_MMIOREG is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set @@ -972,6 +1009,7 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set @@ -1007,6 +1045,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIOLIB is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set +# CONFIG_POWER_AVS is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_WATCHDOG is not set @@ -1032,7 +1071,9 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set # CONFIG_ABX500_CORE is not set +# CONFIG_MFD_SYSCON is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -1130,6 +1171,7 @@ CONFIG_AC97_BUS=y # CONFIG_HID=y # CONFIG_HIDRAW is not set +# CONFIG_UHID is not set CONFIG_HID_GENERIC=y # @@ -1157,6 +1199,7 @@ CONFIG_HID_GYRATION=y CONFIG_HID_TWINHAN=y CONFIG_HID_KENSINGTON=y # CONFIG_HID_LCPOWER is not set +# CONFIG_HID_LENOVO_TPKBD is not set CONFIG_HID_LOGITECH=y CONFIG_HID_LOGITECH_DJ=m # CONFIG_LOGITECH_FF is not set @@ -1190,6 +1233,7 @@ CONFIG_HID_THRUSTMASTER=y CONFIG_HID_ZEROPLUS=y # CONFIG_ZEROPLUS_FF is not set # CONFIG_HID_ZYDACRON is not set +# CONFIG_HID_SENSOR_HUB is not set # # USB HID support @@ -1256,8 +1300,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -1292,10 +1334,12 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_YUREX is not set +# CONFIG_USB_EZUSB_FX2 is not set # # USB Physical Layer drivers # +# CONFIG_OMAP_USB2 is not set # CONFIG_USB_GADGET is not set # @@ -1330,6 +1374,7 @@ CONFIG_MMC_ARMMMCI=y # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set +# CONFIG_EDAC is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -1365,12 +1410,14 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_V3020 is not set +# CONFIG_RTC_DRV_DS2404 is not set # # on-CPU RTC drivers # # CONFIG_RTC_DRV_PL030 is not set CONFIG_RTC_DRV_PL031=y +# CONFIG_RTC_DRV_SNVS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set @@ -1378,7 +1425,6 @@ CONFIG_RTC_DRV_PL031=y # # Virtio drivers # -# CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_MMIO is not set # @@ -1386,17 +1432,25 @@ CONFIG_RTC_DRV_PL031=y # # CONFIG_STAGING is not set CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_MACH_CLKDEV=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +# CONFIG_COMMON_CLK_DEBUG is not set # # Hardware Spinlock drivers # CONFIG_CLKSRC_MMIO=y CONFIG_IOMMU_SUPPORT=y +CONFIG_OF_IOMMU=y # # Remoteproc drivers (EXPERIMENTAL) # +# CONFIG_STE_MODEM_RPROC is not set # # Rpmsg drivers (EXPERIMENTAL) @@ -1406,10 +1460,12 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set # CONFIG_IIO is not set +# CONFIG_PWM is not set # # File systems # +CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=y @@ -1498,6 +1554,7 @@ CONFIG_NFS_V2=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set +# CONFIG_NFS_SWAP is not set CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y @@ -1580,7 +1637,6 @@ CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set # CONFIG_LOCKUP_DETECTOR is not set -# CONFIG_HARDLOCKUP_DETECTOR is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_DETECT_HUNG_TASK=y @@ -1593,6 +1649,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -1604,6 +1661,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y @@ -1617,6 +1675,7 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 @@ -1627,29 +1686,45 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_LKDTM is not set -# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_ENABLE_DEFAULT_TRACERS is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_STACK_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_PROBE_EVENTS is not set +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set @@ -1659,9 +1734,12 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_TEST_KSTRTOX is not set # CONFIG_STRICT_DEVMEM is not set CONFIG_ARM_UNWIND=y +CONFIG_OLD_MCOUNT=y CONFIG_DEBUG_USER=y # CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_OC_ETM is not set +# CONFIG_PID_IN_CONTEXTIDR is not set # # Security options @@ -1729,6 +1807,7 @@ CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set # CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA1_ARM is not set # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set @@ -1737,7 +1816,8 @@ CONFIG_CRYPTO_CRC32C=y # # Ciphers # -# CONFIG_CRYPTO_AES is not set +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES_ARM is not set # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_ARC4 is not set # CONFIG_CRYPTO_BLOWFISH is not set @@ -1767,12 +1847,14 @@ CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_USER_API_HASH is not set # CONFIG_CRYPTO_USER_API_SKCIPHER is not set # CONFIG_CRYPTO_HW is not set -# CONFIG_BINARY_PRINTF is not set +CONFIG_BINARY_PRINTF=y # # Library routines # CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IO=y # CONFIG_CRC_CCITT is not set @@ -1809,6 +1891,7 @@ CONFIG_HAS_DMA=y CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y # CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set # CONFIG_DDR is not set diff --git a/platformconfig b/platformconfig index 7125085..e12bfe9 100644 --- a/platformconfig +++ b/platformconfig @@ -1,8 +1,8 @@ # -# Automatically generated make config: don't edit -# PTXdist 2012.09.1 +# Automatically generated file; DO NOT EDIT. +# PTXdist 2012.12.0 # -PTXCONF_PLATFORMCONFIG_VERSION="2012.09.1" +PTXCONF_PLATFORMCONFIG_VERSION="2012.12.0" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF__platformconfig_MAGIC__=y # ------------------------------------ # PTXCONF_PLATFORM="pengutronix-vexpress" -PTXCONF_PLATFORM_VERSION="-2012.09.1" +PTXCONF_PLATFORM_VERSION="-2012.12.0" # # architecture @@ -72,19 +72,32 @@ PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}" PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}" # +# hardening options +# +PTXCONF_TARGET_HARDEN_STACK=y +PTXCONF_TARGET_HARDEN_FORTIFY=y +PTXCONF_TARGET_HARDEN_RELRO=y +PTXCONF_TARGET_HARDEN_BINDNOW=y +PTXCONF_TARGET_HARDEN_PIE=y + +# # extra toolchain options # +PTXCONF_TARGET_LINKER_HASH_DEFAULT=y +# PTXCONF_TARGET_LINKER_HASH_SYSV is not set +# PTXCONF_TARGET_LINKER_HASH_GNU is not set +# PTXCONF_TARGET_LINKER_HASH_BOTH is not set PTXCONF_TARGET_EXTRA_CPPFLAGS="" PTXCONF_TARGET_EXTRA_CFLAGS="" PTXCONF_TARGET_EXTRA_CXXFLAGS="" PTXCONF_TARGET_EXTRA_LDFLAGS="" PTXCONF_KERNEL=y -# PTXCONF_KERNEL_INSTALL is not set +PTXCONF_KERNEL_INSTALL=y PTXCONF_KERNEL_MODULES=y PTXCONF_KERNEL_MODULES_INSTALL=y PTXCONF_KERNEL_MODULES_BUILD="modules" -PTXCONF_KERNEL_VERSION="3.5.4" -PTXCONF_KERNEL_MD5="d806cb4cbadba05cc4d1bd208d1546ef" +PTXCONF_KERNEL_VERSION="3.7.1" +PTXCONF_KERNEL_MD5="b3f99fb945b270b503b2a0996b8b29e7" PTXCONF_KERNEL_ARCH_STRING="arm" # PTXCONF_KERNEL_IMAGE_BZ is not set PTXCONF_KERNEL_IMAGE_Z=y @@ -102,7 +115,7 @@ PTXCONF_KERNEL_IMAGE="zImage" # patching & configuration # PTXCONF_KERNEL_SERIES="series${PTXDIST_PLATFORMSUFFIX}" -PTXCONF_KERNEL_CONFIG="kernelconfig-${PTXCONF_KERNEL_VERSION}" +PTXCONF_KERNEL_CONFIG="kernelconfig" # # Development features @@ -146,19 +159,8 @@ PTXCONF_FLASH_BLOCKSIZE="128k" # PTXCONF_IMAGE_BOOT_MLO_VFAT is not set # PTXCONF_IMAGE_CPIO is not set # PTXCONF_IMAGE_CPIO_GZ is not set -PTXCONF_IMAGE_EXT2=y -PTXCONF_IMAGE_EXT2_SIZE=40960 -PTXCONF_IMAGE_EXT2_EXTRA_ARGS="-N3000" -# PTXCONF_IMAGE_EXT2_GZIP is not set -# PTXCONF_IMAGE_EXT2_JOURNAL is not set -# PTXCONF_IMAGE_EXT2_EXT4 is not set -PTXCONF_IMAGE_HD=y -PTXCONF_IMAGE_HD_PART1=y -PTXCONF_IMAGE_HD_PART1_START="2048" -PTXCONF_IMAGE_HD_PART1_END="83967" -PTXCONF_IMAGE_HD_PART1_TYPE="0x83" -# PTXCONF_IMAGE_HD_PART2 is not set -PTXCONF_IMAGE_HD_PART1_CONTENT="${IMAGEDIR}/root.ext2" +# PTXCONF_IMAGE_EXT2 is not set +# PTXCONF_IMAGE_HD is not set # PTXCONF_IMAGE_VDI is not set # @@ -170,7 +172,10 @@ PTXCONF_IMAGE_IPKG_INDEX=y PTXCONF_IMAGE_IPKG_EXTRA_ARGS="" # PTXCONF_IMAGE_JFFS2 is not set PTXCONF_IMAGE_KERNEL=y -# PTXCONF_IMAGE_KERNEL_INITRAMFS is not set + +# +# 'rootfs in kernel image' is incompatible with 'install kernel into /boot' +# PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y # PTXCONF_IMAGE_KERNEL_LZOP is not set # PTXCONF_IMAGE_SQUASHFS is not set @@ -183,23 +188,31 @@ PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y # new image creation options # # PTXCONF_IMAGE_BOOT_MLO is not set -# PTXCONF_IMAGE_ROOT_EXT is not set -# PTXCONF_IMAGE_ROOT_TGZ is not set -PTXCONF_CROSS_MODULE_INIT_TOOLS=y +# PTXCONF_IMAGE_ROOT_CPIO_GZ is not set +# PTXCONF_IMAGE_ROOT_CPIO is not set +PTXCONF_IMAGE_ROOT_EXT=y +PTXCONF_IMAGE_ROOT_EXT_SIZE="128M" +PTXCONF_IMAGE_ROOT_EXT_EXT2=y +# PTXCONF_IMAGE_ROOT_EXT_EXT3 is not set +# PTXCONF_IMAGE_ROOT_EXT_EXT4 is not set +PTXCONF_IMAGE_ROOT_EXT_TYPE="ext2" +PTXCONF_IMAGE_ROOT_TGZ=y +PTXCONF_IMAGE_SD=y # PTXCONF_HOST_CDRKIT is not set # PTXCONF_HOST_CMAKE is not set # PTXCONF_HOST_CRAMFS is not set # PTXCONF_HOST_DOSFSTOOLS is not set PTXCONF_HOST_E2FSPROGS=y PTXCONF_HOST_GENEXT2FS=y -# PTXCONF_HOST_GENIMAGE is not set -PTXCONF_HOST_GENPART=y +PTXCONF_HOST_GENIMAGE=y +# PTXCONF_HOST_GENPART is not set # PTXCONF_HOST_LIBICONV is not set # PTXCONF_HOST_GETTEXT is not set # PTXCONF_HOST_LIBBLKID is not set # PTXCONF_HOST_LIBBZ2 is not set # PTXCONF_HOST_LIBCAP is not set -# PTXCONF_HOST_LIBCONFUSE is not set +PTXCONF_HOST_LIBCONFUSE=y +PTXCONF_HOST_LIBKMOD=y # PTXCONF_HOST_LIBLZO is not set # PTXCONF_HOST_LIBUUID is not set # PTXCONF_HOST_LZOP is not set diff --git a/platforms/image-sd.in b/platforms/image-sd.in new file mode 100644 index 0000000..d55ba6a --- /dev/null +++ b/platforms/image-sd.in @@ -0,0 +1,7 @@ +## SECTION=image2 + +config IMAGE_SD + tristate + select HOST_GENIMAGE + select IMAGE_ROOT_EXT + prompt "Generate images/sd.img" diff --git a/rules/image-sd.make b/rules/image-sd.make new file mode 100644 index 0000000..d18aa39 --- /dev/null +++ b/rules/image-sd.make @@ -0,0 +1,33 @@ +# -*-makefile-*- +# +# Copyright (C) 2012 by Jan Luebbe <jlu@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +IMAGE_PACKAGES-$(PTXCONF_IMAGE_SD) += image-sd + +# +# Paths and names +# +IMAGE_SD := image-sd +IMAGE_SD_DIR := $(BUILDDIR)/$(IMAGE_SD) +IMAGE_SD_IMAGE := $(IMAGEDIR)/sd.img +IMAGE_SD_CONFIG := sd.config + +# ---------------------------------------------------------------------------- +# Image +# ---------------------------------------------------------------------------- + +$(IMAGE_SD_IMAGE): + @$(call targetinfo) + @$(call image/genimage, IMAGE_SD) + @$(call finish) + +# vim: syntax=make @@ -32,7 +32,7 @@ if [ ! -e "${PTXDIST_PLATFORMDIR}/images/linuximage" ]; then exit 1 fi -if [ ! -e "${PTXDIST_PLATFORMDIR}/images/hd.img" ]; then +if [ ! -e "${PTXDIST_PLATFORMDIR}/images/sd.img" ]; then echo "error: run 'ptxdist images' first" exit 1 fi @@ -81,6 +81,6 @@ ${QEMU_EXEC} ${QEMU_NOGRAPHIC} \ ${QEMU_NET} \ -redir tcp:${TELNET_EXTERNAL_PORT}:${PLATFORM_IP}:${TELNET_INTERNAL_PORT} \ -kernel ${PTXDIST_PLATFORMDIR}/images/linuximage \ - -sd ${PTXDIST_PLATFORMDIR}/images/hd.img \ + -sd ${PTXDIST_PLATFORMDIR}/images/sd.img \ -smp 2 \ -append "root=/dev/mmcblk0p1 rootfs=ext2 rw mem=1024M console=ttyAMA0,38400n8 rootwait" |