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 The following boards are supported by the meta-yocto-bsp layer: - * Texas Instruments Beagleboard (beagleboard) * Freescale MPC8315E-RDB (mpc8315e-rdb) * Ubiquiti Networks RouterStation Pro (routerstationpro) @@ -180,96 +179,6 @@ USB Device: http://git.kernel.org/?p=boot/syslinux/syslinux.git;a=blob_plain;f=doc/usbkey.txt;hb=HEAD -Texas Instruments Beagleboard (beagleboard) -=========================================== - -The Beagleboard is an ARM Cortex-A8 development board with USB, DVI-D, S-Video, -2D/3D accelerated graphics, audio, serial, JTAG, and SD/MMC. The xM adds a -faster CPU, more RAM, an ethernet port, more USB ports, microSD, and removes -the NAND flash. The beagleboard MACHINE is tested on the following platforms: - - o Beagleboard C4 - o Beagleboard xM rev A & B - -The Beagleboard C4 has NAND, while the xM does not. For the sake of simplicity, -these instructions assume you have erased the NAND on the C4 so its boot -behavior matches that of the xM. To do this, issue the following commands from -the u-boot prompt (note that the unlock may be unecessary depending on the -version of u-boot installed on your board and only one of the erase commands -will succeed): - - # nand unlock - # nand erase - # nand erase.chip - -To further tailor these instructions for your board, please refer to the -documentation at http://www.beagleboard.org. - -From a Linux system with access to the image files perform the following steps -as root, replacing mmcblk0* with the SD card device on your machine (such as sdc -if used via a usb card reader): - - 1. Partition and format an SD card: - # fdisk -lu /dev/mmcblk0 - - Disk /dev/mmcblk0: 3951 MB, 3951034368 bytes - 255 heads, 63 sectors/track, 480 cylinders, total 7716864 sectors - Units = sectors of 1 * 512 = 512 bytes - - Device Boot Start End Blocks Id System - /dev/mmcblk0p1 * 63 144584 72261 c Win95 FAT32 (LBA) - /dev/mmcblk0p2 144585 465884 160650 83 Linux - - # mkfs.vfat -F 16 -n "boot" /dev/mmcblk0p1 - # mke2fs -j -L "root" /dev/mmcblk0p2 - - The following assumes the SD card partition 1 and 2 are mounted at - /media/boot and /media/root respectively. Removing the card and reinserting - it will do just that on most modern Linux desktop environments. - - The files referenced below are made available after the build in - build/tmp/deploy/images. - - 2. Install the boot loaders - # cp MLO-beagleboard /media/boot/MLO - # cp u-boot-beagleboard.bin /media/boot/u-boot.bin - - 3. Install the root filesystem - # tar x -C /media/root -f core-image-$IMAGE_TYPE-beagleboard.tar.bz2 - # tar x -C /media/root -f modules-$KERNEL_VERSION-beagleboard.tgz - - 4. Install the kernel uImage - # cp uImage-beagleboard.bin /media/boot/uImage - - 5. Prepare a u-boot script to simplify the boot process - The Beagleboard can be made to boot at this point from the u-boot command - shell. To automate this process, generate a user.scr script as follows. - - Install uboot-mkimage (from uboot-mkimage on Ubuntu or uboot-tools on Fedora). - - Prepare a script config: - - # (cat << EOF - setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; bootm 0x80300000' - setenv bootargs 'console=tty0 console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 ro' - boot - EOF - ) > serial-boot.cmd - # mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Core Minimal" -d ./serial-boot.cmd ./boot.scr - # cp boot.scr /media/boot - - 6. Unmount the SD partitions, insert the SD card into the Beagleboard, and - boot the Beagleboard - -Note: As of the 2.6.37 linux-yocto kernel recipe, the Beagleboard uses the - OMAP_SERIAL device (ttyO2). If you are using an older kernel, such as the - 2.6.34 linux-yocto-stable, be sure to replace ttyO2 with ttyS2 above. You - should also override the machine SERIAL_CONSOLE in your local.conf in - order to setup the getty on the serial line: - - SERIAL_CONSOLE_beagleboard = "115200 ttyS2" - - Freescale MPC8315E-RDB (mpc8315e-rdb) ===================================== 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 @@ -#@TYPE: Machine -#@NAME: Beagleboard machine -#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xf86-input-evdev \ - xf86-input-mouse \ - 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" - -# 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 -# meta-yocto). For maximum compatibility, leave this disabled. -#DEFAULTTUNE ?= "cortexa8hf-neon" -include conf/machine/include/tune-cortexa8.inc - -IMAGE_FSTYPES += "tar.bz2 jffs2" -EXTRA_IMAGECMD_jffs2 = "-lnp " - -# 2.6.37 and later kernels use OMAP_SERIAL, ttyO2 -# earlier kernels use ttyS2 -SERIAL_CONSOLE = "115200 ttyO2" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.10%" - -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" -UBOOT_MACHINE = "omap3_beagle_config" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" - -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 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - -# Wireless interfaces -iface wlan0 inet dhcp - wireless_mode managed - wireless_essid any - wpa-driver wext - wpa-conf /etc/wpa_supplicant.conf - -iface atml0 inet dhcp - -# Wired or wireless interfaces -auto eth0 -iface eth0 inet dhcp -iface eth1 inet dhcp - -# Ethernet/RNDIS gadget (g_ether) or LAN9514 on BeagleBoard xM -auto usb0 -iface usb0 inet dhcp - -# Bluetooth networking -iface bnep0 inet dhcp - 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 @@ -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 @@ -Section "Module" - Load "extmod" - Load "dbe" - Load "glx" - Load "freetype" - Load "type1" - Load "record" - Load "dri" -EndSection - -Section "Monitor" - Identifier "Builtin Default Monitor" -EndSection - -Section "Device" - Identifier "Builtin Default fbdev Device 0" - Driver "omapfb" -EndSection - -Section "Screen" - Identifier "Builtin Default fbdev Screen 0" - Device "Builtin Default fbdev Device 0" - Monitor "Builtin Default Monitor" -EndSection - -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default fbdev Screen 0" -EndSection - -Section "ServerFlags" - Option "DontZap" "0" -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" KBRANCH_genericx86-64 = "standard/common-pc-64/base" KBRANCH_routerstationpro = "standard/routerstationpro" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" -KBRANCH_beagleboard = "standard/beagleboard" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" @@ -11,13 +10,11 @@ SRCREV_machine_genericx86 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c" SRCREV_machine_genericx86-64 ?= "2ee37bfe732c73f7d39af55875ce8d30b282471c" SRCREV_machine_routerstationpro ?= "628fb65e665a4179b6df049563f47f521f9dfb4e" SRCREV_machine_mpc8315e-rdb ?= "2688f74bf2bb01ec355bbdd4b6fa00a0d39302de" -SRCREV_machine_beagleboard ?= "dbd7d0033e92dcec6682760982228e88df9982e2" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" -COMPATIBLE_MACHINE_beagleboard = "beagleboard" # routerstationpro has a flash size of 16mb 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 @@ KBRANCH_routerstationpro = "standard/routerstationpro" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" -KBRANCH_beagleboard = "standard/beagleboard" SRCREV_machine_genericx86 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" SRCREV_machine_routerstationpro ?= "62b86dc8ac794cd97c61a99418d7429e6a83ec1a" SRCREV_machine_mpc8315e-rdb ?= "b2f78892b3ff6cc940e4661f7b2017a73b289c73" -SRCREV_machine_beagleboard ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" -COMPATIBLE_MACHINE_beagleboard = "beagleboard" # routerstationpro has a flash size of 16mb 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 ["yocto/pvr", "yocto/pvr"] ["yocto/standard/arm-versatile-926ejs", "yocto/standard/arm-versatile-926ejs"] ["yocto/standard/base", "yocto/standard/base"] - ["yocto/standard/beagleboard", "yocto/standard/beagleboard"] ["yocto/standard/cedartrail", "yocto/standard/cedartrail"] . .