diff options
8 files changed, 0 insertions, 202 deletions
diff --git a/README.hardware b/README.hardware index eccc7d3e6e..85f033057e 100644 --- a/README.hardware +++ b/README.hardware | |||
@@ -46,7 +46,6 @@ Hardware Reference Boards | |||
46 | 46 | ||
47 | The following boards are supported by the meta-yocto-bsp layer: | 47 | The following boards are supported by the meta-yocto-bsp layer: |
48 | 48 | ||
49 | * Texas Instruments Beagleboard (beagleboard) | ||
50 | * Freescale MPC8315E-RDB (mpc8315e-rdb) | 49 | * Freescale MPC8315E-RDB (mpc8315e-rdb) |
51 | * Ubiquiti Networks RouterStation Pro (routerstationpro) | 50 | * Ubiquiti Networks RouterStation Pro (routerstationpro) |
52 | 51 | ||
@@ -180,96 +179,6 @@ USB Device: | |||
180 | http://git.kernel.org/?p=boot/syslinux/syslinux.git;a=blob_plain;f=doc/usbkey.txt;hb=HEAD | 179 | http://git.kernel.org/?p=boot/syslinux/syslinux.git;a=blob_plain;f=doc/usbkey.txt;hb=HEAD |
181 | 180 | ||
182 | 181 | ||
183 | Texas Instruments Beagleboard (beagleboard) | ||
184 | =========================================== | ||
185 | |||
186 | The Beagleboard is an ARM Cortex-A8 development board with USB, DVI-D, S-Video, | ||
187 | 2D/3D accelerated graphics, audio, serial, JTAG, and SD/MMC. The xM adds a | ||
188 | faster CPU, more RAM, an ethernet port, more USB ports, microSD, and removes | ||
189 | the NAND flash. The beagleboard MACHINE is tested on the following platforms: | ||
190 | |||
191 | o Beagleboard C4 | ||
192 | o Beagleboard xM rev A & B | ||
193 | |||
194 | The Beagleboard C4 has NAND, while the xM does not. For the sake of simplicity, | ||
195 | these instructions assume you have erased the NAND on the C4 so its boot | ||
196 | behavior matches that of the xM. To do this, issue the following commands from | ||
197 | the u-boot prompt (note that the unlock may be unecessary depending on the | ||
198 | version of u-boot installed on your board and only one of the erase commands | ||
199 | will succeed): | ||
200 | |||
201 | # nand unlock | ||
202 | # nand erase | ||
203 | # nand erase.chip | ||
204 | |||
205 | To further tailor these instructions for your board, please refer to the | ||
206 | documentation at http://www.beagleboard.org. | ||
207 | |||
208 | From a Linux system with access to the image files perform the following steps | ||
209 | as root, replacing mmcblk0* with the SD card device on your machine (such as sdc | ||
210 | if used via a usb card reader): | ||
211 | |||
212 | 1. Partition and format an SD card: | ||
213 | # fdisk -lu /dev/mmcblk0 | ||
214 | |||
215 | Disk /dev/mmcblk0: 3951 MB, 3951034368 bytes | ||
216 | 255 heads, 63 sectors/track, 480 cylinders, total 7716864 sectors | ||
217 | Units = sectors of 1 * 512 = 512 bytes | ||
218 | |||
219 | Device Boot Start End Blocks Id System | ||
220 | /dev/mmcblk0p1 * 63 144584 72261 c Win95 FAT32 (LBA) | ||
221 | /dev/mmcblk0p2 144585 465884 160650 83 Linux | ||
222 | |||
223 | # mkfs.vfat -F 16 -n "boot" /dev/mmcblk0p1 | ||
224 | # mke2fs -j -L "root" /dev/mmcblk0p2 | ||
225 | |||
226 | The following assumes the SD card partition 1 and 2 are mounted at | ||
227 | /media/boot and /media/root respectively. Removing the card and reinserting | ||
228 | it will do just that on most modern Linux desktop environments. | ||
229 | |||
230 | The files referenced below are made available after the build in | ||
231 | build/tmp/deploy/images. | ||
232 | |||
233 | 2. Install the boot loaders | ||
234 | # cp MLO-beagleboard /media/boot/MLO | ||
235 | # cp u-boot-beagleboard.bin /media/boot/u-boot.bin | ||
236 | |||
237 | 3. Install the root filesystem | ||
238 | # tar x -C /media/root -f core-image-$IMAGE_TYPE-beagleboard.tar.bz2 | ||
239 | # tar x -C /media/root -f modules-$KERNEL_VERSION-beagleboard.tgz | ||
240 | |||
241 | 4. Install the kernel uImage | ||
242 | # cp uImage-beagleboard.bin /media/boot/uImage | ||
243 | |||
244 | 5. Prepare a u-boot script to simplify the boot process | ||
245 | The Beagleboard can be made to boot at this point from the u-boot command | ||
246 | shell. To automate this process, generate a user.scr script as follows. | ||
247 | |||
248 | Install uboot-mkimage (from uboot-mkimage on Ubuntu or uboot-tools on Fedora). | ||
249 | |||
250 | Prepare a script config: | ||
251 | |||
252 | # (cat << EOF | ||
253 | setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; bootm 0x80300000' | ||
254 | setenv bootargs 'console=tty0 console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 ro' | ||
255 | boot | ||
256 | EOF | ||
257 | ) > serial-boot.cmd | ||
258 | # mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Core Minimal" -d ./serial-boot.cmd ./boot.scr | ||
259 | # cp boot.scr /media/boot | ||
260 | |||
261 | 6. Unmount the SD partitions, insert the SD card into the Beagleboard, and | ||
262 | boot the Beagleboard | ||
263 | |||
264 | Note: As of the 2.6.37 linux-yocto kernel recipe, the Beagleboard uses the | ||
265 | OMAP_SERIAL device (ttyO2). If you are using an older kernel, such as the | ||
266 | 2.6.34 linux-yocto-stable, be sure to replace ttyO2 with ttyS2 above. You | ||
267 | should also override the machine SERIAL_CONSOLE in your local.conf in | ||
268 | order to setup the getty on the serial line: | ||
269 | |||
270 | SERIAL_CONSOLE_beagleboard = "115200 ttyS2" | ||
271 | |||
272 | |||
273 | Freescale MPC8315E-RDB (mpc8315e-rdb) | 182 | Freescale MPC8315E-RDB (mpc8315e-rdb) |
274 | ===================================== | 183 | ===================================== |
275 | 184 | ||
diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf deleted file mode 100644 index 138c43a700..0000000000 --- a/meta-yocto-bsp/conf/machine/beagleboard.conf +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: Beagleboard machine | ||
3 | #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board | ||
4 | |||
5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | ||
6 | XSERVER ?= "xserver-xorg \ | ||
7 | xf86-input-evdev \ | ||
8 | xf86-input-mouse \ | ||
9 | xf86-video-omapfb \ | ||
10 | xf86-input-keyboard" | ||
11 | |||
12 | # Ship all kernel modules by default | ||
13 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | ||
14 | |||
15 | # Allow for MMC booting (required by the NAND-less Beagleboard XM) | ||
16 | EXTRA_IMAGEDEPENDS += "u-boot" | ||
17 | |||
18 | # Uncomment the following line to enable the hard floating point abi. Note that | ||
19 | # this breaks some binary libraries and 3D (neither of which ship with | ||
20 | # meta-yocto). For maximum compatibility, leave this disabled. | ||
21 | #DEFAULTTUNE ?= "cortexa8hf-neon" | ||
22 | include conf/machine/include/tune-cortexa8.inc | ||
23 | |||
24 | IMAGE_FSTYPES += "tar.bz2 jffs2" | ||
25 | EXTRA_IMAGECMD_jffs2 = "-lnp " | ||
26 | |||
27 | # 2.6.37 and later kernels use OMAP_SERIAL, ttyO2 | ||
28 | # earlier kernels use ttyS2 | ||
29 | SERIAL_CONSOLE = "115200 ttyO2" | ||
30 | |||
31 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | ||
32 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | ||
33 | |||
34 | KERNEL_IMAGETYPE = "zImage" | ||
35 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/omap3-beagle.dts ${S}/arch/arm/boot/dts/omap3-beagle-xm.dts" | ||
36 | |||
37 | SPL_BINARY = "MLO" | ||
38 | UBOOT_SUFFIX = "img" | ||
39 | UBOOT_MACHINE = "omap3_beagle_config" | ||
40 | UBOOT_ENTRYPOINT = "0x80008000" | ||
41 | UBOOT_LOADADDRESS = "0x80008000" | ||
42 | |||
43 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa" | ||
diff --git a/meta-yocto-bsp/recipes-core/init-ifupdown/init-ifupdown-1.0/beagleboard/interfaces b/meta-yocto-bsp/recipes-core/init-ifupdown/init-ifupdown-1.0/beagleboard/interfaces deleted file mode 100644 index b6935c11af..0000000000 --- a/meta-yocto-bsp/recipes-core/init-ifupdown/init-ifupdown-1.0/beagleboard/interfaces +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) | ||
2 | |||
3 | # The loopback interface | ||
4 | auto lo | ||
5 | iface lo inet loopback | ||
6 | |||
7 | # Wireless interfaces | ||
8 | iface wlan0 inet dhcp | ||
9 | wireless_mode managed | ||
10 | wireless_essid any | ||
11 | wpa-driver wext | ||
12 | wpa-conf /etc/wpa_supplicant.conf | ||
13 | |||
14 | iface atml0 inet dhcp | ||
15 | |||
16 | # Wired or wireless interfaces | ||
17 | auto eth0 | ||
18 | iface eth0 inet dhcp | ||
19 | iface eth1 inet dhcp | ||
20 | |||
21 | # Ethernet/RNDIS gadget (g_ether) or LAN9514 on BeagleBoard xM | ||
22 | auto usb0 | ||
23 | iface usb0 inet dhcp | ||
24 | |||
25 | # Bluetooth networking | ||
26 | iface bnep0 inet dhcp | ||
27 | |||
diff --git a/meta-yocto-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-yocto-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend deleted file mode 100644 index 56223033bd..0000000000 --- a/meta-yocto-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" | ||
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf deleted file mode 100644 index 264f3c91ad..0000000000 --- a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beagleboard/xorg.conf +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Section "Module" | ||
2 | Load "extmod" | ||
3 | Load "dbe" | ||
4 | Load "glx" | ||
5 | Load "freetype" | ||
6 | Load "type1" | ||
7 | Load "record" | ||
8 | Load "dri" | ||
9 | EndSection | ||
10 | |||
11 | Section "Monitor" | ||
12 | Identifier "Builtin Default Monitor" | ||
13 | EndSection | ||
14 | |||
15 | Section "Device" | ||
16 | Identifier "Builtin Default fbdev Device 0" | ||
17 | Driver "omapfb" | ||
18 | EndSection | ||
19 | |||
20 | Section "Screen" | ||
21 | Identifier "Builtin Default fbdev Screen 0" | ||
22 | Device "Builtin Default fbdev Device 0" | ||
23 | Monitor "Builtin Default Monitor" | ||
24 | EndSection | ||
25 | |||
26 | Section "ServerLayout" | ||
27 | Identifier "Builtin Default Layout" | ||
28 | Screen "Builtin Default fbdev Screen 0" | ||
29 | EndSection | ||
30 | |||
31 | Section "ServerFlags" | ||
32 | Option "DontZap" "0" | ||
33 | EndSection | ||
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend index 5ff899e1ca..c24ffb8d94 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -2,7 +2,6 @@ KBRANCH_genericx86 = "standard/common-pc/base" | |||
2 | KBRANCH_genericx86-64 = "standard/common-pc-64/base" | 2 | KBRANCH_genericx86-64 = "standard/common-pc-64/base" |
3 | KBRANCH_routerstationpro = "standard/routerstationpro" | 3 | KBRANCH_routerstationpro = "standard/routerstationpro" |
4 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | 4 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" |
5 | KBRANCH_beagleboard = "standard/beagleboard" | ||
6 | 5 | ||
7 | KMACHINE_genericx86 ?= "common-pc" | 6 | KMACHINE_genericx86 ?= "common-pc" |
8 | KMACHINE_genericx86-64 ?= "common-pc-64" | 7 | KMACHINE_genericx86-64 ?= "common-pc-64" |
@@ -11,13 +10,11 @@ SRCREV_machine_genericx86 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c" | |||
11 | SRCREV_machine_genericx86-64 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c" | 10 | SRCREV_machine_genericx86-64 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c" |
12 | SRCREV_machine_routerstationpro ?= "628fb65e665a4179b6df049563f47f521f9dfb4e" | 11 | SRCREV_machine_routerstationpro ?= "628fb65e665a4179b6df049563f47f521f9dfb4e" |
13 | SRCREV_machine_mpc8315e-rdb ?= "2688f74bf2bb01ec355bbdd4b6fa00a0d39302de" | 12 | SRCREV_machine_mpc8315e-rdb ?= "2688f74bf2bb01ec355bbdd4b6fa00a0d39302de" |
14 | SRCREV_machine_beagleboard ?= "dbd7d0033e92dcec6682760982228e88df9982e2" | ||
15 | 13 | ||
16 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | 14 | COMPATIBLE_MACHINE_genericx86 = "genericx86" |
17 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | 15 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" |
18 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | 16 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" |
19 | COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" | 17 | COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" |
20 | COMPATIBLE_MACHINE_beagleboard = "beagleboard" | ||
21 | 18 | ||
22 | # routerstationpro has a flash size of 16mb | 19 | # routerstationpro has a flash size of 16mb |
23 | KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216" | 20 | KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216" |
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend index 7c2bd67708..0ff485f46a 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend | |||
@@ -1,15 +1,12 @@ | |||
1 | KBRANCH_routerstationpro = "standard/routerstationpro" | 1 | KBRANCH_routerstationpro = "standard/routerstationpro" |
2 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | 2 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" |
3 | KBRANCH_beagleboard = "standard/beagleboard" | ||
4 | 3 | ||
5 | SRCREV_machine_genericx86 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" | 4 | SRCREV_machine_genericx86 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" |
6 | SRCREV_machine_routerstationpro ?= "62b86dc8ac794cd97c61a99418d7429e6a83ec1a" | 5 | SRCREV_machine_routerstationpro ?= "62b86dc8ac794cd97c61a99418d7429e6a83ec1a" |
7 | SRCREV_machine_mpc8315e-rdb ?= "b2f78892b3ff6cc940e4661f7b2017a73b289c73" | 6 | SRCREV_machine_mpc8315e-rdb ?= "b2f78892b3ff6cc940e4661f7b2017a73b289c73" |
8 | SRCREV_machine_beagleboard ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" | ||
9 | 7 | ||
10 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | 8 | COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" |
11 | COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" | 9 | COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" |
12 | COMPATIBLE_MACHINE_beagleboard = "beagleboard" | ||
13 | 10 | ||
14 | # routerstationpro has a flash size of 16mb | 11 | # routerstationpro has a flash size of 16mb |
15 | KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216" | 12 | KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216" |
diff --git a/scripts/lib/bsp/help.py b/scripts/lib/bsp/help.py index a2eb7b6bf3..7c436d6be0 100644 --- a/scripts/lib/bsp/help.py +++ b/scripts/lib/bsp/help.py | |||
@@ -319,7 +319,6 @@ DESCRIPTION | |||
319 | ["yocto/pvr", "yocto/pvr"] | 319 | ["yocto/pvr", "yocto/pvr"] |
320 | ["yocto/standard/arm-versatile-926ejs", "yocto/standard/arm-versatile-926ejs"] | 320 | ["yocto/standard/arm-versatile-926ejs", "yocto/standard/arm-versatile-926ejs"] |
321 | ["yocto/standard/base", "yocto/standard/base"] | 321 | ["yocto/standard/base", "yocto/standard/base"] |
322 | ["yocto/standard/beagleboard", "yocto/standard/beagleboard"] | ||
323 | ["yocto/standard/cedartrail", "yocto/standard/cedartrail"] | 322 | ["yocto/standard/cedartrail", "yocto/standard/cedartrail"] |
324 | . | 323 | . |
325 | . | 324 | . |