yocto-bsp: add 3.10/remove 3.8 kernel from templates

For Yocto 1.5, 3.10 is the preferred kernel and 3.8 is obsolete. This also removes any mention of emgd from the templates - we want to discourage users from using it - it will be obsolete soon in any case. Fixes [YOCTO #5107] (From meta-yocto rev: 4dd4bf6ac2dcc7652ec8f807df02298546bdb41b) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2026-07-16 03:47:03 +00:00 · 2013-09-23 08:42:51 -05:00
parent bf6b0d95db
commit 0fc8317c63
75 changed files with 423 additions and 365 deletions
@@ -5,18 +5,18 @@

 {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
 {{ if xserver == "y": }}
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
           xf86-input-evdev \
           xf86-input-mouse \
-           xf86-video-omap \
+           xf86-video-omapfb \
           xf86-input-keyboard"

 # Ship all kernel modules by default
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"

 # Allow for MMC booting (required by the NAND-less Beagleboard XM)
-EXTRA_IMAGEDEPENDS += "u-boot x-load"
+EXTRA_IMAGEDEPENDS += "u-boot"

 # Uncomment the following line to enable the hard floating point abi. Note that
 # this breaks some binary libraries and 3D (neither of which ship with
@@ -27,8 +27,11 @@ EXTRA_IMAGEDEPENDS += "u-boot x-load"
 {{ input type:"choice" val:"tune_arm920t" msg:"arm920t tuning optimizations" }}
 {{ input type:"choice" val:"tune_arm926ejs" msg:"arm926ejs tuning optimizations" }}
 {{ input type:"choice" val:"tune_arm9tdmi" msg:"arm9tdmi tuning optimizations" }}
+{{ input type:"choice" val:"tune_cortexa5" msg:"cortexa5 tuning optimizations" }}
+{{ input type:"choice" val:"tune_cortexa7" msg:"cortexa7 tuning optimizations" }}
 {{ input type:"choice" val:"tune_cortexa8" msg:"cortexa8 tuning optimizations" }}
 {{ input type:"choice" val:"tune_cortexa9" msg:"cortexa9 tuning optimizations" }}
+{{ input type:"choice" val:"tune_cortexa15" msg:"cortexa15 tuning optimizations" }}
 {{ input type:"choice" val:"tune_cortexm1" msg:"cortexm1 tuning optimizations" }}
 {{ input type:"choice" val:"tune_cortexm3" msg:"cortexm3 tuning optimizations" }}
 {{ input type:"choice" val:"tune_cortexr4" msg:"cortexr4 tuning optimizations" }}
@@ -44,10 +47,16 @@ include conf/machine/include/tune-arm920t.inc
 include conf/machine/include/tune-arm926ejs.inc
 {{ if tunefile == "tune_arm9tdmi": }}
 include conf/machine/include/tune-arm9tdmi.inc
+{{ if tunefile == "tune_cortexa5": }}
+include conf/machine/include/tune-cortexa5.inc
+{{ if tunefile == "tune_cortexa7": }}
+include conf/machine/include/tune-cortexa7.inc
 {{ if tunefile == "tune_cortexa8": }}
 include conf/machine/include/tune-cortexa8.inc
 {{ if tunefile == "tune_cortexa9": }}
 include conf/machine/include/tune-cortexa9.inc
+{{ if tunefile == "tune_cortexa15": }}
+include conf/machine/include/tune-cortexa15.inc
 {{ if tunefile == "tune_cortexm1": }}
 include conf/machine/include/tune-cortexm1.inc
 {{ if tunefile == "tune_cortexm3": }}
@@ -81,8 +90,11 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
 PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
 PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"

-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/omap3-beagle.dts ${S}/arch/arm/boot/dts/omap3-beagle-xm.dts"

+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
 {{ input type:"edit" name:"uboot_machine" prio:"40" msg:"Please specify a value for UBOOT_MACHINE:" default:"omap3_beagle_config" }}
 UBOOT_MACHINE = "{{=uboot_machine}}"
 {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x80008000" }}
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -1,5 +1,5 @@
 {{ if kernel_choice != "custom": }}
-{{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.8) kernel? (y/n)" default:"y"}}
+{{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.10) kernel? (y/n)" default:"y"}}

 {{ if kernel_choice != "custom" and use_default_kernel == "n": }}
-{{ input type:"choicelist" name:"kernel_choice" gen:"bsp.kernel.kernels" prio:"10" msg:"Please choose the kernel to use in this BSP:" default:"linux-yocto_3.8"}}
+{{ input type:"choicelist" name:"kernel_choice" gen:"bsp.kernel.kernels" prio:"10" msg:"Please choose the kernel to use in this BSP:" default:"linux-yocto_3.10"}}
@@ -7,3 +7,7 @@ include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranc
 branch {{=machine}}

 include {{=machine}}.scc
+
+# default policy for preempt-rt kernels
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
@@ -7,3 +7,7 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)
 branch {{=machine}}

 include {{=machine}}.scc
+
+# default policy for standard kernels
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
@@ -2,8 +2,6 @@
 # System Type
 #
 CONFIG_ARCH_OMAP=y
-CONFIG_HAVE_PWM=y
-CONFIG_ARM_L1_CACHE_SHIFT_6=y

 #
 # TI OMAP Implementations
@@ -27,8 +25,6 @@ CONFIG_OMAP_SMARTREFLEX=y
 CONFIG_OMAP_SMARTREFLEX_CLASS3=y
 CONFIG_OMAP_MBOX_FWK=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-CONFIG_OMAP_IOMMU=m
-CONFIG_OMAP_IOMMU_DEBUG=m

 #
 # OMAP Board Type
@@ -39,7 +35,6 @@ CONFIG_MACH_OMAP3_BEAGLE=y
 # Processor Features
 #
 CONFIG_ARM_THUMBEE=y
-CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_ERRATA_430973=y

 #
@@ -51,14 +46,8 @@ CONFIG_LEDS=y
 #
 # Serial drivers
 #
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_OMAP=y
+CONFIG_SERIAL_OMAP_CONSOLE=y

 #
 # At least one emulation must be selected
@@ -76,13 +65,10 @@ CONFIG_PM_RUNTIME=y
 # Generic Driver Options
 #
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CMDLINE_PARTS=y
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y

@@ -98,7 +84,6 @@ CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_NAND=y

 CONFIG_MTD_NAND_OMAP2=y
-# CONFIG_MTD_NAND_OMAP_PREFETCH is not set

 CONFIG_MTD_UBI=y

@@ -116,6 +101,7 @@ CONFIG_BLK_DEV_SD=y
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_SMSC911X=y
+CONFIG_USB_NET_SMSC95XX=y

 #
 # Userland interfaces
@@ -171,12 +157,11 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SYS_FOPS is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -186,8 +171,6 @@ CONFIG_FB_MODE_HELPERS=y
 #
 # Frame buffer hardware drivers
 #
-CONFIG_FB_OMAP=y
-CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -206,7 +189,6 @@ CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_VENC=y
 # CONFIG_OMAP2_DSS_SDI is not set
 CONFIG_OMAP2_DSS_DSI=y
-CONFIG_OMAP2_DSS_USE_DSI_PLL=y
 # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
 CONFIG_FB_OMAP2=y
@@ -216,13 +198,11 @@ CONFIG_FB_OMAP2_NUM_FBS=2
 #
 # OMAP2/3 Display Device Drivers
 #
-CONFIG_PANEL_GENERIC=y
+CONFIG_PANEL_GENERIC_DPI=y
+CONFIG_PANEL_DVI=y
 CONFIG_PANEL_SHARP_LS037V7DW01=y
 # CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set
-# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set
 # CONFIG_PANEL_TAAL is not set
-CONFIG_PANEL_TOPPOLY_TDO35S=m
 CONFIG_PANEL_TPO_TD043MTEA1=m
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -247,11 +227,16 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_VGA_CONSOLE is not set

+# DMA Devices
+CONFIG_DMADEVICES=y
+CONFIG_DMA_OMAP=y
+CONFIG_DMA_OF=y
+
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
+CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y

 #
 # USB Input Devices
@@ -262,7 +247,6 @@ CONFIG_USB_SUPPORT=y
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
 CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set

@@ -274,7 +258,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_USB_MUSB_SOC=y
+CONFIG_USB_OMAP=y

 #
 # OMAP 343x high speed USB support
@@ -284,7 +268,6 @@ CONFIG_USB_GADGET_MUSB_HDRC=y
 CONFIG_USB_MUSB_HDRC_HCD=y
 CONFIG_USB_INVENTRA_DMA=y

-
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
@@ -302,6 +285,10 @@ CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_OTG_UTILS=y
 CONFIG_TWL4030_USB=y

+# USB gadget modules
+CONFIG_USB_G_NCM=y
+CONFIG_USB_MASS_STORAGE=y
+
 CONFIG_MMC=y

 #
@@ -325,9 +312,6 @@ CONFIG_VFAT_FS=y
 # Multimedia core support
 #

-CONFIG_VIDEO_OMAP3_ISP=y
-# CONFIG_VIDEO_OMAP34XX_ISP_PREVIEWER is not set
-CONFIG_VIDEO_OMAP34XX_ISP_RESIZER=y
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set

 #
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 PR := "${PR}.1"

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 PR := "${PR}.1"

@@ -29,4 +29,4 @@ SRC_URI += "file://{{=machine}}-preempt-rt.scc \
 # the appropriate changes committed to the upstream linux-yocto repo
 #SRCREV_machine_pn-linux-yocto-rt_{{=machine}} ?= "f35992f80c81dc5fa1a97165dfd5cbb84661f7cb"
 #SRCREV_meta_pn-linux-yocto-rt_{{=machine}} ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f"
-#LINUX_VERSION = "3.8.4"
+#LINUX_VERSION = "3.10.9"
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 PR := "${PR}.1"

@@ -0,0 +1,32 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+PR := "${PR}.1"
+
+COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
+
+{{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }}
+
+{{ if need_new_kbranch == "y": }}
+{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/base" }}
+
+{{ if need_new_kbranch == "n": }}
+{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/base" }}
+
+{{ if need_new_kbranch == "n": }}
+KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"
+
+{{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}}
+{{ if smp == "y": }}
+KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
+
+SRC_URI += "file://{{=machine}}-tiny.scc \
+            file://{{=machine}}-user-config.cfg \
+            file://{{=machine}}-user-patches.scc \
+            file://{{=machine}}-user-features.scc \
+           "
+
+# uncomment and replace these SRCREVs with the real commit ids once you've had
+# the appropriate changes committed to the upstream linux-yocto repo
+#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
+#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993"
+#LINUX_VERSION = "3.10.9"
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 PR := "${PR}.1"

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 PR := "${PR}.1"

@@ -29,3 +29,4 @@ SRC_URI += "file://{{=machine}}-standard.scc \
 # the appropriate changes committed to the upstream linux-yocto repo
 #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
 #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7"
+#LINUX_VERSION = "3.10.9"
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 PR := "${PR}.1"