diff options
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/arm')
13 files changed, 88 insertions, 51 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf index 744486e6a9..44a80d226c 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf | |||
@@ -5,18 +5,18 @@ | |||
5 | 5 | ||
6 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 6 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
7 | {{ if xserver == "y": }} | 7 | {{ if xserver == "y": }} |
8 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 8 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
9 | XSERVER = "xserver-xorg \ | 9 | XSERVER ?= "xserver-xorg \ |
10 | xf86-input-evdev \ | 10 | xf86-input-evdev \ |
11 | xf86-input-mouse \ | 11 | xf86-input-mouse \ |
12 | xf86-video-omap \ | 12 | xf86-video-omapfb \ |
13 | xf86-input-keyboard" | 13 | xf86-input-keyboard" |
14 | 14 | ||
15 | # Ship all kernel modules by default | 15 | # Ship all kernel modules by default |
16 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 16 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" |
17 | 17 | ||
18 | # Allow for MMC booting (required by the NAND-less Beagleboard XM) | 18 | # Allow for MMC booting (required by the NAND-less Beagleboard XM) |
19 | EXTRA_IMAGEDEPENDS += "u-boot x-load" | 19 | EXTRA_IMAGEDEPENDS += "u-boot" |
20 | 20 | ||
21 | # Uncomment the following line to enable the hard floating point abi. Note that | 21 | # Uncomment the following line to enable the hard floating point abi. Note that |
22 | # this breaks some binary libraries and 3D (neither of which ship with | 22 | # this breaks some binary libraries and 3D (neither of which ship with |
@@ -27,8 +27,11 @@ EXTRA_IMAGEDEPENDS += "u-boot x-load" | |||
27 | {{ input type:"choice" val:"tune_arm920t" msg:"arm920t tuning optimizations" }} | 27 | {{ input type:"choice" val:"tune_arm920t" msg:"arm920t tuning optimizations" }} |
28 | {{ input type:"choice" val:"tune_arm926ejs" msg:"arm926ejs tuning optimizations" }} | 28 | {{ input type:"choice" val:"tune_arm926ejs" msg:"arm926ejs tuning optimizations" }} |
29 | {{ input type:"choice" val:"tune_arm9tdmi" msg:"arm9tdmi tuning optimizations" }} | 29 | {{ input type:"choice" val:"tune_arm9tdmi" msg:"arm9tdmi tuning optimizations" }} |
30 | {{ input type:"choice" val:"tune_cortexa5" msg:"cortexa5 tuning optimizations" }} | ||
31 | {{ input type:"choice" val:"tune_cortexa7" msg:"cortexa7 tuning optimizations" }} | ||
30 | {{ input type:"choice" val:"tune_cortexa8" msg:"cortexa8 tuning optimizations" }} | 32 | {{ input type:"choice" val:"tune_cortexa8" msg:"cortexa8 tuning optimizations" }} |
31 | {{ input type:"choice" val:"tune_cortexa9" msg:"cortexa9 tuning optimizations" }} | 33 | {{ input type:"choice" val:"tune_cortexa9" msg:"cortexa9 tuning optimizations" }} |
34 | {{ input type:"choice" val:"tune_cortexa15" msg:"cortexa15 tuning optimizations" }} | ||
32 | {{ input type:"choice" val:"tune_cortexm1" msg:"cortexm1 tuning optimizations" }} | 35 | {{ input type:"choice" val:"tune_cortexm1" msg:"cortexm1 tuning optimizations" }} |
33 | {{ input type:"choice" val:"tune_cortexm3" msg:"cortexm3 tuning optimizations" }} | 36 | {{ input type:"choice" val:"tune_cortexm3" msg:"cortexm3 tuning optimizations" }} |
34 | {{ input type:"choice" val:"tune_cortexr4" msg:"cortexr4 tuning optimizations" }} | 37 | {{ input type:"choice" val:"tune_cortexr4" msg:"cortexr4 tuning optimizations" }} |
@@ -44,10 +47,16 @@ include conf/machine/include/tune-arm920t.inc | |||
44 | include conf/machine/include/tune-arm926ejs.inc | 47 | include conf/machine/include/tune-arm926ejs.inc |
45 | {{ if tunefile == "tune_arm9tdmi": }} | 48 | {{ if tunefile == "tune_arm9tdmi": }} |
46 | include conf/machine/include/tune-arm9tdmi.inc | 49 | include conf/machine/include/tune-arm9tdmi.inc |
50 | {{ if tunefile == "tune_cortexa5": }} | ||
51 | include conf/machine/include/tune-cortexa5.inc | ||
52 | {{ if tunefile == "tune_cortexa7": }} | ||
53 | include conf/machine/include/tune-cortexa7.inc | ||
47 | {{ if tunefile == "tune_cortexa8": }} | 54 | {{ if tunefile == "tune_cortexa8": }} |
48 | include conf/machine/include/tune-cortexa8.inc | 55 | include conf/machine/include/tune-cortexa8.inc |
49 | {{ if tunefile == "tune_cortexa9": }} | 56 | {{ if tunefile == "tune_cortexa9": }} |
50 | include conf/machine/include/tune-cortexa9.inc | 57 | include conf/machine/include/tune-cortexa9.inc |
58 | {{ if tunefile == "tune_cortexa15": }} | ||
59 | include conf/machine/include/tune-cortexa15.inc | ||
51 | {{ if tunefile == "tune_cortexm1": }} | 60 | {{ if tunefile == "tune_cortexm1": }} |
52 | include conf/machine/include/tune-cortexm1.inc | 61 | include conf/machine/include/tune-cortexm1.inc |
53 | {{ if tunefile == "tune_cortexm3": }} | 62 | {{ if tunefile == "tune_cortexm3": }} |
@@ -81,8 +90,11 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | |||
81 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 90 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
82 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 91 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
83 | 92 | ||
84 | KERNEL_IMAGETYPE = "uImage" | 93 | KERNEL_IMAGETYPE = "zImage" |
94 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/omap3-beagle.dts ${S}/arch/arm/boot/dts/omap3-beagle-xm.dts" | ||
85 | 95 | ||
96 | SPL_BINARY = "MLO" | ||
97 | UBOOT_SUFFIX = "img" | ||
86 | {{ input type:"edit" name:"uboot_machine" prio:"40" msg:"Please specify a value for UBOOT_MACHINE:" default:"omap3_beagle_config" }} | 98 | {{ input type:"edit" name:"uboot_machine" prio:"40" msg:"Please specify a value for UBOOT_MACHINE:" default:"omap3_beagle_config" }} |
87 | UBOOT_MACHINE = "{{=uboot_machine}}" | 99 | UBOOT_MACHINE = "{{=uboot_machine}}" |
88 | {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x80008000" }} | 100 | {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x80008000" }} |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend index 155f67b622..72d991c7e5 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-graphics/xorg-xserver/{{ if xserver == "y": }} xserver-xf86-config_0.1.bbappend | |||
@@ -1 +1 @@ | |||
FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:" | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall index 6754c6df44..88a5d18751 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall | |||
@@ -1,5 +1,5 @@ | |||
1 | {{ if kernel_choice != "custom": }} | 1 | {{ if kernel_choice != "custom": }} |
2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.8) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.10) kernel? (y/n)" default:"y"}} |
3 | 3 | ||
4 | {{ if kernel_choice != "custom" and use_default_kernel == "n": }} | 4 | {{ if kernel_choice != "custom" and use_default_kernel == "n": }} |
5 | {{ 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"}} | 5 | {{ 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"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc index de0bff28a3..56f7f0f1e3 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc | |||
@@ -7,3 +7,7 @@ include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranc | |||
7 | branch {{=machine}} | 7 | branch {{=machine}} |
8 | 8 | ||
9 | include {{=machine}}.scc | 9 | include {{=machine}}.scc |
10 | |||
11 | # default policy for preempt-rt kernels | ||
12 | include features/latencytop/latencytop.scc | ||
13 | include features/profiling/profiling.scc | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc index b12c50c90d..80640db4a2 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | |||
@@ -7,3 +7,7 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) | |||
7 | branch {{=machine}} | 7 | branch {{=machine}} |
8 | 8 | ||
9 | include {{=machine}}.scc | 9 | include {{=machine}}.scc |
10 | |||
11 | # default policy for standard kernels | ||
12 | include features/latencytop/latencytop.scc | ||
13 | include features/profiling/profiling.scc | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.cfg b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.cfg index 994e034252..10134c81f5 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.cfg +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.cfg | |||
@@ -2,8 +2,6 @@ | |||
2 | # System Type | 2 | # System Type |
3 | # | 3 | # |
4 | CONFIG_ARCH_OMAP=y | 4 | CONFIG_ARCH_OMAP=y |
5 | CONFIG_HAVE_PWM=y | ||
6 | CONFIG_ARM_L1_CACHE_SHIFT_6=y | ||
7 | 5 | ||
8 | # | 6 | # |
9 | # TI OMAP Implementations | 7 | # TI OMAP Implementations |
@@ -27,8 +25,6 @@ CONFIG_OMAP_SMARTREFLEX=y | |||
27 | CONFIG_OMAP_SMARTREFLEX_CLASS3=y | 25 | CONFIG_OMAP_SMARTREFLEX_CLASS3=y |
28 | CONFIG_OMAP_MBOX_FWK=m | 26 | CONFIG_OMAP_MBOX_FWK=m |
29 | CONFIG_OMAP_MBOX_KFIFO_SIZE=256 | 27 | CONFIG_OMAP_MBOX_KFIFO_SIZE=256 |
30 | CONFIG_OMAP_IOMMU=m | ||
31 | CONFIG_OMAP_IOMMU_DEBUG=m | ||
32 | 28 | ||
33 | # | 29 | # |
34 | # OMAP Board Type | 30 | # OMAP Board Type |
@@ -39,7 +35,6 @@ CONFIG_MACH_OMAP3_BEAGLE=y | |||
39 | # Processor Features | 35 | # Processor Features |
40 | # | 36 | # |
41 | CONFIG_ARM_THUMBEE=y | 37 | CONFIG_ARM_THUMBEE=y |
42 | CONFIG_ARM_L1_CACHE_SHIFT=6 | ||
43 | CONFIG_ARM_ERRATA_430973=y | 38 | CONFIG_ARM_ERRATA_430973=y |
44 | 39 | ||
45 | # | 40 | # |
@@ -51,14 +46,8 @@ CONFIG_LEDS=y | |||
51 | # | 46 | # |
52 | # Serial drivers | 47 | # Serial drivers |
53 | # | 48 | # |
54 | CONFIG_SERIAL_8250=y | 49 | CONFIG_SERIAL_OMAP=y |
55 | CONFIG_SERIAL_8250_CONSOLE=y | 50 | CONFIG_SERIAL_OMAP_CONSOLE=y |
56 | CONFIG_SERIAL_8250_EXTENDED=y | ||
57 | CONFIG_SERIAL_8250_RSA=y | ||
58 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
59 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
60 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
61 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
62 | 51 | ||
63 | # | 52 | # |
64 | # At least one emulation must be selected | 53 | # At least one emulation must be selected |
@@ -76,13 +65,10 @@ CONFIG_PM_RUNTIME=y | |||
76 | # Generic Driver Options | 65 | # Generic Driver Options |
77 | # | 66 | # |
78 | CONFIG_MTD=y | 67 | CONFIG_MTD=y |
79 | CONFIG_MTD_CONCAT=y | ||
80 | CONFIG_MTD_PARTITIONS=y | ||
81 | CONFIG_MTD_CMDLINE_PARTS=y | 68 | CONFIG_MTD_CMDLINE_PARTS=y |
82 | # | 69 | # |
83 | # User Modules And Translation Layers | 70 | # User Modules And Translation Layers |
84 | # | 71 | # |
85 | CONFIG_MTD_CHAR=y | ||
86 | CONFIG_MTD_BLKDEVS=y | 72 | CONFIG_MTD_BLKDEVS=y |
87 | CONFIG_MTD_BLOCK=y | 73 | CONFIG_MTD_BLOCK=y |
88 | 74 | ||
@@ -98,7 +84,6 @@ CONFIG_MTD_CFI_INTELEXT=y | |||
98 | CONFIG_MTD_NAND=y | 84 | CONFIG_MTD_NAND=y |
99 | 85 | ||
100 | CONFIG_MTD_NAND_OMAP2=y | 86 | CONFIG_MTD_NAND_OMAP2=y |
101 | # CONFIG_MTD_NAND_OMAP_PREFETCH is not set | ||
102 | 87 | ||
103 | CONFIG_MTD_UBI=y | 88 | CONFIG_MTD_UBI=y |
104 | 89 | ||
@@ -116,6 +101,7 @@ CONFIG_BLK_DEV_SD=y | |||
116 | # Ethernet (10 or 100Mbit) | 101 | # Ethernet (10 or 100Mbit) |
117 | # | 102 | # |
118 | CONFIG_SMSC911X=y | 103 | CONFIG_SMSC911X=y |
104 | CONFIG_USB_NET_SMSC95XX=y | ||
119 | 105 | ||
120 | # | 106 | # |
121 | # Userland interfaces | 107 | # Userland interfaces |
@@ -171,12 +157,11 @@ CONFIG_FB_CFB_FILLRECT=y | |||
171 | CONFIG_FB_CFB_COPYAREA=y | 157 | CONFIG_FB_CFB_COPYAREA=y |
172 | CONFIG_FB_CFB_IMAGEBLIT=y | 158 | CONFIG_FB_CFB_IMAGEBLIT=y |
173 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | 159 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
174 | CONFIG_FB_SYS_FILLRECT=m | 160 | # CONFIG_FB_SYS_FILLRECT is not set |
175 | CONFIG_FB_SYS_COPYAREA=m | 161 | # CONFIG_FB_SYS_COPYAREA is not set |
176 | CONFIG_FB_SYS_IMAGEBLIT=m | 162 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
177 | # CONFIG_FB_FOREIGN_ENDIAN is not set | 163 | # CONFIG_FB_FOREIGN_ENDIAN is not set |
178 | CONFIG_FB_SYS_FOPS=m | 164 | # CONFIG_FB_SYS_FOPS is not set |
179 | CONFIG_FB_DEFERRED_IO=y | ||
180 | # CONFIG_FB_SVGALIB is not set | 165 | # CONFIG_FB_SVGALIB is not set |
181 | # CONFIG_FB_MACMODES is not set | 166 | # CONFIG_FB_MACMODES is not set |
182 | # CONFIG_FB_BACKLIGHT is not set | 167 | # CONFIG_FB_BACKLIGHT is not set |
@@ -186,8 +171,6 @@ CONFIG_FB_MODE_HELPERS=y | |||
186 | # | 171 | # |
187 | # Frame buffer hardware drivers | 172 | # Frame buffer hardware drivers |
188 | # | 173 | # |
189 | CONFIG_FB_OMAP=y | ||
190 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
191 | # CONFIG_FB_S1D13XXX is not set | 174 | # CONFIG_FB_S1D13XXX is not set |
192 | # CONFIG_FB_TMIO is not set | 175 | # CONFIG_FB_TMIO is not set |
193 | # CONFIG_FB_VIRTUAL is not set | 176 | # CONFIG_FB_VIRTUAL is not set |
@@ -206,7 +189,6 @@ CONFIG_OMAP2_DSS_DPI=y | |||
206 | CONFIG_OMAP2_DSS_VENC=y | 189 | CONFIG_OMAP2_DSS_VENC=y |
207 | # CONFIG_OMAP2_DSS_SDI is not set | 190 | # CONFIG_OMAP2_DSS_SDI is not set |
208 | CONFIG_OMAP2_DSS_DSI=y | 191 | CONFIG_OMAP2_DSS_DSI=y |
209 | CONFIG_OMAP2_DSS_USE_DSI_PLL=y | ||
210 | # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set | 192 | # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set |
211 | CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 | 193 | CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 |
212 | CONFIG_FB_OMAP2=y | 194 | CONFIG_FB_OMAP2=y |
@@ -216,13 +198,11 @@ CONFIG_FB_OMAP2_NUM_FBS=2 | |||
216 | # | 198 | # |
217 | # OMAP2/3 Display Device Drivers | 199 | # OMAP2/3 Display Device Drivers |
218 | # | 200 | # |
219 | CONFIG_PANEL_GENERIC=y | 201 | CONFIG_PANEL_GENERIC_DPI=y |
202 | CONFIG_PANEL_DVI=y | ||
220 | CONFIG_PANEL_SHARP_LS037V7DW01=y | 203 | CONFIG_PANEL_SHARP_LS037V7DW01=y |
221 | # CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set | 204 | # CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set |
222 | # CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set | ||
223 | # CONFIG_PANEL_SHARP_LQ043T1DG01 is not set | ||
224 | # CONFIG_PANEL_TAAL is not set | 205 | # CONFIG_PANEL_TAAL is not set |
225 | CONFIG_PANEL_TOPPOLY_TDO35S=m | ||
226 | CONFIG_PANEL_TPO_TD043MTEA1=m | 206 | CONFIG_PANEL_TPO_TD043MTEA1=m |
227 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 207 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
228 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 208 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
@@ -247,11 +227,16 @@ CONFIG_FRAMEBUFFER_CONSOLE=y | |||
247 | CONFIG_LOGO=y | 227 | CONFIG_LOGO=y |
248 | # CONFIG_VGA_CONSOLE is not set | 228 | # CONFIG_VGA_CONSOLE is not set |
249 | 229 | ||
230 | # DMA Devices | ||
231 | CONFIG_DMADEVICES=y | ||
232 | CONFIG_DMA_OMAP=y | ||
233 | CONFIG_DMA_OF=y | ||
234 | |||
250 | CONFIG_SOUND=y | 235 | CONFIG_SOUND=y |
251 | CONFIG_SND=y | 236 | CONFIG_SND=y |
252 | CONFIG_SND_SOC=y | 237 | CONFIG_SND_SOC=y |
253 | CONFIG_SND_OMAP_SOC=y | 238 | CONFIG_SND_OMAP_SOC=y |
254 | CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y | 239 | CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y |
255 | 240 | ||
256 | # | 241 | # |
257 | # USB Input Devices | 242 | # USB Input Devices |
@@ -262,7 +247,6 @@ CONFIG_USB_SUPPORT=y | |||
262 | # | 247 | # |
263 | # Miscellaneous USB options | 248 | # Miscellaneous USB options |
264 | # | 249 | # |
265 | CONFIG_USB_DEVICEFS=y | ||
266 | CONFIG_USB_OTG=y | 250 | CONFIG_USB_OTG=y |
267 | # CONFIG_USB_OTG_WHITELIST is not set | 251 | # CONFIG_USB_OTG_WHITELIST is not set |
268 | 252 | ||
@@ -274,7 +258,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y | |||
274 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 258 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
275 | CONFIG_USB_MUSB_HDRC=y | 259 | CONFIG_USB_MUSB_HDRC=y |
276 | CONFIG_USB_MUSB_OMAP2PLUS=y | 260 | CONFIG_USB_MUSB_OMAP2PLUS=y |
277 | CONFIG_USB_MUSB_SOC=y | 261 | CONFIG_USB_OMAP=y |
278 | 262 | ||
279 | # | 263 | # |
280 | # OMAP 343x high speed USB support | 264 | # OMAP 343x high speed USB support |
@@ -284,7 +268,6 @@ CONFIG_USB_GADGET_MUSB_HDRC=y | |||
284 | CONFIG_USB_MUSB_HDRC_HCD=y | 268 | CONFIG_USB_MUSB_HDRC_HCD=y |
285 | CONFIG_USB_INVENTRA_DMA=y | 269 | CONFIG_USB_INVENTRA_DMA=y |
286 | 270 | ||
287 | |||
288 | # | 271 | # |
289 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 272 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
290 | # | 273 | # |
@@ -302,6 +285,10 @@ CONFIG_USB_GADGET_DUALSPEED=y | |||
302 | CONFIG_USB_OTG_UTILS=y | 285 | CONFIG_USB_OTG_UTILS=y |
303 | CONFIG_TWL4030_USB=y | 286 | CONFIG_TWL4030_USB=y |
304 | 287 | ||
288 | # USB gadget modules | ||
289 | CONFIG_USB_G_NCM=y | ||
290 | CONFIG_USB_MASS_STORAGE=y | ||
291 | |||
305 | CONFIG_MMC=y | 292 | CONFIG_MMC=y |
306 | 293 | ||
307 | # | 294 | # |
@@ -325,9 +312,6 @@ CONFIG_VFAT_FS=y | |||
325 | # Multimedia core support | 312 | # Multimedia core support |
326 | # | 313 | # |
327 | 314 | ||
328 | CONFIG_VIDEO_OMAP3_ISP=y | ||
329 | # CONFIG_VIDEO_OMAP34XX_ISP_PREVIEWER is not set | ||
330 | CONFIG_VIDEO_OMAP34XX_ISP_RESIZER=y | ||
331 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | 315 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set |
332 | 316 | ||
333 | # | 317 | # |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend index 146009aa1c..25c87a85ac 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | 2 | ||
3 | PR := "${PR}.1" | 3 | PR := "${PR}.1" |
4 | 4 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.8": }} linux-yocto-rt_3.8.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.10": }} linux-yocto-rt_3.10.bbappend index fb78cf15a1..08b1f88d1b 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.8": }} linux-yocto-rt_3.8.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.10": }} linux-yocto-rt_3.10.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | 2 | ||
3 | PR := "${PR}.1" | 3 | PR := "${PR}.1" |
4 | 4 | ||
@@ -29,4 +29,4 @@ SRC_URI += "file://{{=machine}}-preempt-rt.scc \ | |||
29 | # the appropriate changes committed to the upstream linux-yocto repo | 29 | # the appropriate changes committed to the upstream linux-yocto repo |
30 | #SRCREV_machine_pn-linux-yocto-rt_{{=machine}} ?= "f35992f80c81dc5fa1a97165dfd5cbb84661f7cb" | 30 | #SRCREV_machine_pn-linux-yocto-rt_{{=machine}} ?= "f35992f80c81dc5fa1a97165dfd5cbb84661f7cb" |
31 | #SRCREV_meta_pn-linux-yocto-rt_{{=machine}} ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f" | 31 | #SRCREV_meta_pn-linux-yocto-rt_{{=machine}} ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f" |
32 | #LINUX_VERSION = "3.8.4" | 32 | #LINUX_VERSION = "3.10.9" |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend index abb126cf0c..198544f565 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | 2 | ||
3 | PR := "${PR}.1" | 3 | PR := "${PR}.1" |
4 | 4 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.10": }} linux-yocto-tiny_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.10": }} linux-yocto-tiny_3.10.bbappend new file mode 100644 index 0000000000..bc6968d832 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.10": }} linux-yocto-tiny_3.10.bbappend | |||
@@ -0,0 +1,32 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
2 | |||
3 | PR := "${PR}.1" | ||
4 | |||
5 | COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | ||
6 | |||
7 | {{ 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" }} | ||
8 | |||
9 | {{ if need_new_kbranch == "y": }} | ||
10 | {{ 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" }} | ||
11 | |||
12 | {{ if need_new_kbranch == "n": }} | ||
13 | {{ 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" }} | ||
14 | |||
15 | {{ if need_new_kbranch == "n": }} | ||
16 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
17 | |||
18 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
19 | {{ if smp == "y": }} | ||
20 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
21 | |||
22 | SRC_URI += "file://{{=machine}}-tiny.scc \ | ||
23 | file://{{=machine}}-user-config.cfg \ | ||
24 | file://{{=machine}}-user-patches.scc \ | ||
25 | file://{{=machine}}-user-features.scc \ | ||
26 | " | ||
27 | |||
28 | # uncomment and replace these SRCREVs with the real commit ids once you've had | ||
29 | # the appropriate changes committed to the upstream linux-yocto repo | ||
30 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | ||
31 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | ||
32 | #LINUX_VERSION = "3.10.9" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend index df2510c1a0..2f066472a1 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | 2 | ||
3 | PR := "${PR}.1" | 3 | PR := "${PR}.1" |
4 | 4 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.10": }} linux-yocto_3.10.bbappend index cdf52af6c0..1e814c54d7 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.10": }} linux-yocto_3.10.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | 2 | ||
3 | PR := "${PR}.1" | 3 | PR := "${PR}.1" |
4 | 4 | ||
@@ -29,3 +29,4 @@ SRC_URI += "file://{{=machine}}-standard.scc \ | |||
29 | # the appropriate changes committed to the upstream linux-yocto repo | 29 | # the appropriate changes committed to the upstream linux-yocto repo |
30 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" | 30 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" |
31 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" | 31 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" |
32 | #LINUX_VERSION = "3.10.9" \ No newline at end of file | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend index a7635ab7e5..12ce782a61 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | 2 | ||
3 | PR := "${PR}.1" | 3 | PR := "${PR}.1" |
4 | 4 | ||