From: Michael Büsch Date: Fri, 9 Oct 2015 07:46:12 +0000 (+0000) Subject: omap24xx: Append dtb to the zImage X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=56ee70637922e3db6bfe9ecdb73e819c10fd71dd;p=openwrt%2Fstaging%2Fkaloz.git omap24xx: Append dtb to the zImage We just hardcode the n810 dtb for now. It should be selectable via profiles. SVN-Revision: 47166 --- diff --git a/target/linux/omap24xx/Makefile b/target/linux/omap24xx/Makefile index fca9dc3358..5dd5938db2 100644 --- a/target/linux/omap24xx/Makefile +++ b/target/linux/omap24xx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,12 +15,12 @@ CPU_TYPE:=arm1136j-s KERNEL_PATCHVER:=4.1 +KERNELNAME:=zImage dtbs + define Target/Description TI OMAP-24xx endef -KERNELNAME:=zImage - include $(INCLUDE_DIR)/target.mk $(eval $(call BuildTarget)) diff --git a/target/linux/omap24xx/config-4.1 b/target/linux/omap24xx/config-4.1 index 1b7074e1f6..9daded60cc 100644 --- a/target/linux/omap24xx/config-4.1 +++ b/target/linux/omap24xx/config-4.1 @@ -1,8 +1,8 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_APM_EMULATION is not set -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_ARCH_HAS_BANDGAP=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_HAS_SG_CHAIN=y @@ -31,11 +31,16 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_ARCH_WM8750 is not set CONFIG_ARM=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y +# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set # CONFIG_ARM_CPU_SUSPEND is not set CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y +CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y CONFIG_BINFMT_MISC=y CONFIG_BOUNCE=y @@ -44,6 +49,8 @@ CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y CONFIG_CLKSRC_OF=y CONFIG_CLONE_BACKWARDS=y +CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait rootfstype=ext4,ext3,ext2,squashfs,jffs2 console=tty0 console=ttyO2,115200n8 earlyprintk" +CONFIG_CMDLINE_FORCE=y CONFIG_COMMON_CLK=y CONFIG_CPU_32v6=y CONFIG_CPU_32v6K=y @@ -60,26 +67,37 @@ CONFIG_CPU_PABRT_V6=y CONFIG_CPU_TLB_V6=y CONFIG_CPU_V6=y CONFIG_CPU_V6K=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_UART_8250 is not set # CONFIG_DEBUG_USER is not set +# CONFIG_DISPLAY_ENCODER_OPA362 is not set CONFIG_DTC=y -# CONFIG_EMAC_ROCKCHIP is not set CONFIG_EXTCON=y # CONFIG_EXTCON_GPIO is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set +# CONFIG_EXTCON_USB_GPIO is not set +CONFIG_FB=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_CMDLINE=y +CONFIG_FB_OMAP2=y +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +CONFIG_FB_OMAP2_NUM_FBS=3 CONFIG_FRAME_POINTER=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_SCHED_CLOCK=y @@ -139,6 +157,7 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_UID16=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HDMI=y CONFIG_HIGHMEM=y # CONFIG_HIGHPTE is not set CONFIG_HZ_FIXED=0 @@ -148,17 +167,13 @@ CONFIG_I2C_BOARDINFO=y CONFIG_I2C_OMAP=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INPUT=y -# CONFIG_INPUT_REGULATOR_HAPTIC is not set CONFIG_INPUT_RETU_PWRBUTTON=y CONFIG_IOMMU_HELPER=y CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y -# CONFIG_LEDS_REGULATOR is not set CONFIG_LIBFDT=y -# CONFIG_LZ4_COMPRESS is not set -# CONFIG_LZ4_DECOMPRESS is not set CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MACH_NOKIA_N810=y @@ -169,9 +184,8 @@ CONFIG_MACH_OMAP_GENERIC=y CONFIG_MEMORY=y CONFIG_MENELAUS=y CONFIG_MFD_CORE=y -# CONFIG_MFD_DA9150 is not set CONFIG_MFD_RETU=y -# CONFIG_MFD_RT5033 is not set +CONFIG_MFD_SYSCON=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MODULES_USE_ELF_REL=y @@ -191,7 +205,19 @@ CONFIG_OF_NET=y CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y -# CONFIG_OMAP2_DSS is not set +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS=y +CONFIG_OMAP2_DSS_DEBUG=y +CONFIG_OMAP2_DSS_DEBUGFS=y +# CONFIG_OMAP2_DSS_DPI is not set +# CONFIG_OMAP2_DSS_DSI is not set +CONFIG_OMAP2_DSS_INIT=y +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 +CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y +# CONFIG_OMAP2_DSS_VENC is not set +CONFIG_OMAP2_VRFB=y +# CONFIG_OMAP4_DSS_HDMI is not set +# CONFIG_OMAP5_DSS_HDMI is not set CONFIG_OMAP_32K_TIMER=y # CONFIG_OMAP_CONTROL_PHY is not set CONFIG_OMAP_DM_TIMER=y @@ -210,6 +236,8 @@ CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PCI_DOMAINS_GENERIC is not set # CONFIG_PCI_SYSCALL is not set CONFIG_PERF_USE_VMALLOC=y +CONFIG_PGTABLE_LEVELS=2 +# CONFIG_PHY_DM816X_USB is not set CONFIG_PINCTRL=y CONFIG_PM=y CONFIG_PM_CLK=y @@ -217,9 +245,9 @@ CONFIG_PM_CLK=y # CONFIG_RCU_STALL_COMMON is not set CONFIG_REGMAP=y CONFIG_REGMAP_IRQ=y +CONFIG_REGMAP_MMIO=y CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_PBIAS is not set CONFIG_RETU_WATCHDOG=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_SCHED_HRTICK=y @@ -255,10 +283,8 @@ CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VFP=y +CONFIG_VIDEOMODE_HELPERS=y CONFIG_WATCHDOG_CORE=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 -# CONFIG_REGULATOR_PBIAS is not set -# CONFIG_EXTCON_USB_GPIO is not set -# CONFIG_PHY_DM816X_USB is not set diff --git a/target/linux/omap24xx/image/Makefile b/target/linux/omap24xx/image/Makefile index 7a3429fa6c..316cce0f9f 100644 --- a/target/linux/omap24xx/image/Makefile +++ b/target/linux/omap24xx/image/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010 OpenWrt.org +# Copyright (C) 2010-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk NAND_BLOCKSIZE=2048-128k define Image/BuildKernel - $(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage + cat $(KDIR)/zImage $(DTS_DIR)/omap2420-n810.dtb > $(BIN_DIR)/$(IMG_PREFIX)-zImage chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-zImage endef