initial commit for Enea Linux 4.0daisy-enea

Migrated from the internal git server on the daisy-enea branch

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

21 files changed, 590 insertions, 0 deletions

diff --git a/conf/machine/am180x-evm.conf b/conf/machine/am180x-evm.conf
new file mode 100644
index 00000000..cff15656
--- /dev/null
+++ b/conf/machine/am180x-evm.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: AM180x CPUs on an AM180x EVM board
+#@DESCRIPTION: Machine configuration for the TI AM180x EVM board
+
+require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.inc
+
+UBOOT_MACHINE = "da850evm_config"
+UBOOT_ENTRYPOINT = "0xc0008000"
+UBOOT_LOADADDRESS = "0xc0008000"
+
+IMAGE_FSTYPES += "tar.gz ubi"
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omapl138-psp"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am180x"
+PREFERRED_PROVIDER_u-boot = "u-boot-am180x"
diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf
new file mode 100644
index 00000000..21e79a2f
--- /dev/null
+++ b/conf/machine/am335x-evm.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: AM335x EVM
+#@DESCRIPTION: Machine configuration for the TI AM335x EVM
+
+require conf/machine/include/ti33x.inc
+
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES += "touchscreen"
+
+IMAGE_FSTYPES += "ubi tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyO0"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1988 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+# UBI: VID header offset:          2048 (aligned 2048)
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
new file mode 100644
index 00000000..b9b6d17b
--- /dev/null
+++ b/conf/machine/am3517-evm.conf
@@ -0,0 +1,40 @@
+#@TYPE: Machine
+#@NAME: AM3517 EVM
+#@DESCRIPTION: Machine configuration for the TI Sitara AM3517 EVM
+
+require conf/machine/include/omap3.inc
+
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES += "touchscreen ethernet"
+
+IMAGE_FSTYPES += "ubi tar.gz"
+EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
+
+SERIAL_CONSOLE = "115200 ttyO2"
+USE_VT = "2"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am3517"
+PREFERRED_PROVIDER_u-boot = "u-boot-am3517"
+
+UBOOT_MACHINE = "am3517_evm_config"
+XLOAD_MACHINE = "am3517evm_config"
+
+# NOTE: there are NAND and OneNAND versions of this board...
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf
new file mode 100644
index 00000000..0d53d508
--- /dev/null
+++ b/conf/machine/am37x-evm.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: AM37x EVM
+#@DESCRIPTION: Machine configuration for the TI AM37x EVM
+
+require conf/machine/include/omap3.inc
+
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES += "touchscreen ethernet"
+
+IMAGE_FSTYPES += "ubi tar.gz"
+EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
+
+SERIAL_CONSOLE = "115200 ttyO0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am37x"
+PREFERRED_PROVIDER_u-boot = "u-boot-am37x"
+
+# NOTE: there are NAND and OneNAND versions of this board...
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
diff --git a/conf/machine/am437x-evm.conf b/conf/machine/am437x-evm.conf
new file mode 100644
index 00000000..15e5f537
--- /dev/null
+++ b/conf/machine/am437x-evm.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: AM437x EVM
+#@DESCRIPTION: Machine configuration for the TI AM437x EVM
+
+require conf/machine/include/ti43x.inc
+
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES += "touchscreen"
+
+IMAGE_FSTYPES += "ubi tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyO0"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 11 -O 4096
+# From dmesg:
+# UBI: smallest flash I/O unit:    4096
+# UBI: logical eraseblock size:    253952 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 994 LEBs
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1918"
+
+# do ubiattach /dev/ubi_ctrl -m 11 -O 4096
+# from dmesg:
+# UBI: smallest flash I/O unit:    4096
+# UBI: physical eraseblock size:   262144 bytes (256 KiB)
+# UBI: sub-page size:              4096
+# UBI: VID header offset:          4096 (aligned 4096)
+UBINIZE_ARGS = "-m 4096 -p 256KiB -s 4096 -O 4096"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
new file mode 100644
index 00000000..f9231199
--- /dev/null
+++ b/conf/machine/beagleboard.conf
@@ -0,0 +1,40 @@
+#@TYPE: Machine
+#@NAME: Beagleboard machine
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 
+
+require conf/machine/include/omap3.inc
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-beagleboard"
+PREFERRED_PROVIDER_u-boot = "u-boot-beagleboard"
+
+IMAGE_FSTYPES += "tar.gz ubi"
+EXTRA_IMAGECMD_jffs2 = "-lnp"
+
+SERIAL_CONSOLE = "115200 ttyO2"
+
+UBOOT_MACHINE = "omap3_beagle_config"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+# 
+# Beagleboard C5 has 3998 LEBS (490MiB)
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+# For a modularized kernel we want to drag in networking, sound, rtc etc."
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-smsc95xx kernel-module-snd-soc-twl4030 kernel-module-rtc-twl \
+  kernel-module-snd-soc-omap kernel-module-snd-soc-omap-mcbsp kernel-module-snd-soc-omap3beagle"
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
new file mode 100644
index 00000000..8a83a1ae
--- /dev/null
+++ b/conf/machine/beaglebone.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: BeagleBone machine
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
+
+require conf/machine/include/ti33x.inc
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+IMAGE_FSTYPES += "tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyO0"
+
+UBOOT_MACHINE = "am335x_evm_config"
diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf
new file mode 100644
index 00000000..14253cf3
--- /dev/null
+++ b/conf/machine/dra7xx-evm.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: DRA7xx EVM
+#@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
+
+require conf/machine/include/omap-a15.inc
+
+IMAGE_FSTYPES += "ubi tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyO0"
+
+UBOOT_MACHINE = "dra7xx_evm_config"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1988 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+# UBI: VID header offset:          2048 (aligned 2048)
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
+
+# Currently removing the sgx machine feature because there is no SGX package
+# available for omap5
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
new file mode 100644
index 00000000..6be5eb71
--- /dev/null
+++ b/conf/machine/include/davinci.inc
@@ -0,0 +1,21 @@
+require conf/machine/include/tune-arm926ejs.inc
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r53"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+
+UBOOT_MACHINE = "davinci_dvevm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"
diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
new file mode 100644
index 00000000..b961ad3c
--- /dev/null
+++ b/conf/machine/include/keystone.inc
@@ -0,0 +1,23 @@
+SOC_FAMILY = "keystone"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa15.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-keystone"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-keystone"
+PREFERRED_PROVIDER_u-boot = "u-boot-keystone"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r7"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_MACHINE = "tci6638_evm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "boot-monitor"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci"
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
new file mode 100644
index 00000000..dcf973e2
--- /dev/null
+++ b/conf/machine/include/omap-a15.inc
@@ -0,0 +1,30 @@
+SOC_FAMILY = "omap-a15"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa15.inc
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r3"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+
+KERNEL_IMAGETYPE = "zImage"
+
+UBOOT_ARCH = "arm"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-video-fbdev"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
new file mode 100644
index 00000000..c80939a7
--- /dev/null
+++ b/conf/machine/include/omap3.inc
@@ -0,0 +1,38 @@
+SOC_FAMILY = "omap3"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa8.inc
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+# For built-in LCD, add xf86-input-tslib
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+# Default to external video, change to smallscreen for built-in LCD
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r125"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# Default providers, may need to override for specific machines
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "omap3_evm_config"
+XLOAD_MACHINE = "omap3evm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# If SPL is not used, may need to add x-load
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+# List common SoC features, may need to add touchscreen/ethernet for specific machines
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa sgx"
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
new file mode 100644
index 00000000..f61e6784
--- /dev/null
+++ b/conf/machine/include/omap4.inc
@@ -0,0 +1,24 @@
+SOC_FAMILY = "omap4"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa9.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap4"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-linaro"
+EXTRA_IMAGEDEPENDS += "u-boot-linaro"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xserver-xorg-module-exa \
+           xf86-input-evdev \
+           xf86-video-omap"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r1"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_MACHINE = "omap4_panda_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
diff --git a/conf/machine/include/omapl138.inc b/conf/machine/include/omapl138.inc
new file mode 100644
index 00000000..19496424
--- /dev/null
+++ b/conf/machine/include/omapl138.inc
@@ -0,0 +1,2 @@
+SOC_FAMILY = "omapl138"
+require conf/machine/include/soc-family.inc
diff --git a/conf/machine/include/pandaboard-default-settings.inc b/conf/machine/include/pandaboard-default-settings.inc
new file mode 100644
index 00000000..edd7aeba
--- /dev/null
+++ b/conf/machine/include/pandaboard-default-settings.inc
@@ -0,0 +1,4 @@
+# Pandaboard BSP default settings
+
+IMAGE_CLASSES += "sdcard_image-panda"
+
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
new file mode 100644
index 00000000..17b968d8
--- /dev/null
+++ b/conf/machine/include/ti33x.inc
@@ -0,0 +1,41 @@
+SOC_FAMILY = "ti33x"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa8.inc
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+# For built-in LCD, add xf86-input-tslib
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
+
+# Default to external video, change to smallscreen for built-in LCD
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r21"
+
+# Default providers, may need to override for specific machines
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+
+KERNEL_IMAGETYPE = "zImage"
+
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "am335x_evm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+# List common SoC features, may need to add touchscreen for specific machines
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
new file mode 100644
index 00000000..89133804
--- /dev/null
+++ b/conf/machine/include/ti43x.inc
@@ -0,0 +1,41 @@
+SOC_FAMILY = "ti43x"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa9.inc
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+# For built-in LCD, add xf86-input-tslib
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
+
+# Default to external video, change to smallscreen for built-in LCD
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r2"
+
+# Default providers, may need to override for specific machines
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+
+KERNEL_IMAGETYPE = "zImage"
+
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "am43xx_evm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+# List common SoC features, may need to add touchscreen for specific machines
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"
diff --git a/conf/machine/keystone-evm.conf b/conf/machine/keystone-evm.conf
new file mode 100644
index 00000000..49215236
--- /dev/null
+++ b/conf/machine/keystone-evm.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2
+
+require conf/machine/include/keystone.inc
+
+IMAGE_FSTYPES += "ubi tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+SYSVINIT_ENABLED_GETTYS = ""
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 3856 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              2048
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
new file mode 100644
index 00000000..584866cb
--- /dev/null
+++ b/conf/machine/omap3evm.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: OMAP3 EVM
+#@DESCRIPTION: Machine configuration for the TI OMAP3 EVM
+
+require conf/machine/include/omap3.inc
+
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES += "touchscreen ethernet"
+
+IMAGE_FSTYPES += "jffs2 tar.gz"
+EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+USE_VT = "0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
+
+EXTRA_IMAGEDEPENDS += "x-load"
+
+# NOTE: there are NAND and OneNAND versions of this board...
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
diff --git a/conf/machine/omap5-evm.conf b/conf/machine/omap5-evm.conf
new file mode 100644
index 00000000..ba60e7cf
--- /dev/null
+++ b/conf/machine/omap5-evm.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: OMAP5 EVM
+#@DESCRIPTION: Machine configuration for the TI OMAP5 uEVM
+
+require conf/machine/include/omap-a15.inc
+
+IMAGE_FSTYPES += "ubi tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyO2"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1988 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+# UBI: VID header offset:          2048 (aligned 2048)
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
+
+UBOOT_MACHINE = "omap5_uevm_config"
+
+# Currently removing the sgx machine feature because there is no SGX package
+# available for omap5
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
diff --git a/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf
new file mode 100644
index 00000000..36ad00e4
--- /dev/null
+++ b/conf/machine/pandaboard.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Pandaboard
+#@DESCRIPTION: Machine configuration for the OMAP4430 Panda
+
+include conf/machine/include/pandaboard-default-settings.inc
+require conf/machine/include/omap4.inc
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+IMAGE_FSTYPES += "tar.gz ext3 panda-sdimg"
+
+SERIAL_CONSOLE = "115200 ttyO2"
+
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"