diff options
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf | 24 |
1 files changed, 10 insertions, 14 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 44a80d226c..4bbc96ec62 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 | |||
@@ -9,19 +9,13 @@ 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-omapfb \ | 12 | xf86-video-fbdev \ |
13 | xf86-input-keyboard" | 13 | xf86-input-keyboard" |
14 | 14 | ||
15 | # Ship all kernel modules by default | 15 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" |
16 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | ||
17 | 16 | ||
18 | # Allow for MMC booting (required by the NAND-less Beagleboard XM) | ||
19 | EXTRA_IMAGEDEPENDS += "u-boot" | 17 | EXTRA_IMAGEDEPENDS += "u-boot" |
20 | 18 | ||
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 | ||
23 | # meta-yocto). For maximum compatibility, leave this disabled. | ||
24 | #DEFAULTTUNE ?= "cortexa8hf-neon" | ||
25 | {{ input type:"choicelist" name:"tunefile" prio:"40" msg:"Which machine tuning would you like to use?" default:"tune_cortexa8" }} | 19 | {{ input type:"choicelist" name:"tunefile" prio:"40" msg:"Which machine tuning would you like to use?" default:"tune_cortexa8" }} |
26 | {{ input type:"choice" val:"tune_arm1136jf_s" msg:"arm1136jf-s tuning optimizations" }} | 20 | {{ input type:"choice" val:"tune_arm1136jf_s" msg:"arm1136jf-s tuning optimizations" }} |
27 | {{ input type:"choice" val:"tune_arm920t" msg:"arm920t tuning optimizations" }} | 21 | {{ input type:"choice" val:"tune_arm920t" msg:"arm920t tuning optimizations" }} |
@@ -52,6 +46,7 @@ include conf/machine/include/tune-cortexa5.inc | |||
52 | {{ if tunefile == "tune_cortexa7": }} | 46 | {{ if tunefile == "tune_cortexa7": }} |
53 | include conf/machine/include/tune-cortexa7.inc | 47 | include conf/machine/include/tune-cortexa7.inc |
54 | {{ if tunefile == "tune_cortexa8": }} | 48 | {{ if tunefile == "tune_cortexa8": }} |
49 | DEFAULTTUNE ?= "cortexa8hf-neon" | ||
55 | include conf/machine/include/tune-cortexa8.inc | 50 | include conf/machine/include/tune-cortexa8.inc |
56 | {{ if tunefile == "tune_cortexa9": }} | 51 | {{ if tunefile == "tune_cortexa9": }} |
57 | include conf/machine/include/tune-cortexa9.inc | 52 | include conf/machine/include/tune-cortexa9.inc |
@@ -75,9 +70,7 @@ include conf/machine/include/tune-xscale.inc | |||
75 | IMAGE_FSTYPES += "tar.bz2 jffs2" | 70 | IMAGE_FSTYPES += "tar.bz2 jffs2" |
76 | EXTRA_IMAGECMD_jffs2 = "-lnp " | 71 | EXTRA_IMAGECMD_jffs2 = "-lnp " |
77 | 72 | ||
78 | # 2.6.37 and later kernels use OMAP_SERIAL, ttyO2 | 73 | SERIAL_CONSOLE = "115200 ttyO0" |
79 | # earlier kernels use ttyS2 | ||
80 | SERIAL_CONSOLE = "115200 ttyO2" | ||
81 | 74 | ||
82 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} | 75 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} |
83 | {{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} | 76 | {{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} |
@@ -90,12 +83,13 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | |||
90 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 83 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
91 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 84 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
92 | 85 | ||
93 | KERNEL_IMAGETYPE = "zImage" | 86 | KERNEL_IMAGETYPE = "uImage" |
94 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/omap3-beagle.dts ${S}/arch/arm/boot/dts/omap3-beagle-xm.dts" | 87 | KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" |
88 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | ||
95 | 89 | ||
96 | SPL_BINARY = "MLO" | 90 | SPL_BINARY = "MLO" |
97 | UBOOT_SUFFIX = "img" | 91 | UBOOT_SUFFIX = "img" |
98 | {{ input type:"edit" name:"uboot_machine" prio:"40" msg:"Please specify a value for UBOOT_MACHINE:" default:"omap3_beagle_config" }} | 92 | {{ input type:"edit" name:"uboot_machine" prio:"40" msg:"Please specify a value for UBOOT_MACHINE:" default:"am335x_evm_config" }} |
99 | UBOOT_MACHINE = "{{=uboot_machine}}" | 93 | UBOOT_MACHINE = "{{=uboot_machine}}" |
100 | {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x80008000" }} | 94 | {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x80008000" }} |
101 | UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}" | 95 | UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}" |
@@ -103,3 +97,5 @@ UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}" | |||
103 | UBOOT_LOADADDRESS = "{{=uboot_loadaddress}}" | 97 | UBOOT_LOADADDRESS = "{{=uboot_loadaddress}}" |
104 | 98 | ||
105 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa" | 99 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa" |
100 | |||
101 | IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO" | ||