[meta-lsi] [PATCH 67/86] conf/machine: Rename targets to axxiaarm and axxiapowerpc
Daniel Dragomir
daniel.dragomir at windriver.com
Wed Oct 29 08:36:15 PDT 2014
From: John Jacques <john.jacques at avagotech.com>
The original names "elpaso" and "axm5500" refer to targets, and
are mis-leading. The Linux builds, and file system images, are
for either ARM based targets (now axxiaarm) or PowerPC based
targets (now axxiapowerpc).
---
conf/machine/acp.conf | 20 --------------------
conf/machine/axm.conf | 24 ------------------------
conf/machine/axm5500.conf | 25 -------------------------
conf/machine/axm5500sim.conf | 22 ----------------------
conf/machine/axxiaarm.conf | 23 +++++++++++++++++++++++
conf/machine/axxiapowerpc.conf | 20 ++++++++++++++++++++
conf/machine/elpaso.conf | 20 --------------------
recipes-bsp/u-boot/u-boot-lsi_2010.03.bb | 2 +-
recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb | 4 +---
9 files changed, 45 insertions(+), 115 deletions(-)
delete mode 100644 conf/machine/acp.conf
delete mode 100644 conf/machine/axm.conf
delete mode 100644 conf/machine/axm5500.conf
delete mode 100644 conf/machine/axm5500sim.conf
create mode 100644 conf/machine/axxiaarm.conf
create mode 100644 conf/machine/axxiapowerpc.conf
delete mode 100644 conf/machine/elpaso.conf
diff --git a/conf/machine/acp.conf b/conf/machine/acp.conf
deleted file mode 100644
index 151a876..0000000
--- a/conf/machine/acp.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: acp
-#@DESCRIPTION: Machine configuration for the LSI ACP family (powerpc)
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-PREFERRED_VERSION_u-boot-lsi ?= "2010.03%"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-
-MACHINE_FEATURES += ""
-
-MACHINE_EXTRA_RRECOMMENDS += ""
-
-require conf/machine/include/tune-ppc476.inc
-
-KARCH = "powerpc"
-KERNEL_IMAGETYPE = "uImage"
-UBOOT_ENTRYPOINT = "0x400000"
-KEEPUIMAGE = "no"
-
-SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/axm.conf b/conf/machine/axm.conf
deleted file mode 100644
index ac38164..0000000
--- a/conf/machine/axm.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: axm5500
-#@DESCRIPTION: Machine configuration for LSI AXM5500 systems
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-PREFERRED_VERSION_u-boot-lsi ?= "2013.01.01%"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-lsi"
-#PREFERRED_PROVIDER_virtual/bootemu ?= "u-boot-emu"
-
-#EXTRA_IMAGEDEPENDS = "u-boot-lsi u-boot-emu"
-EXTRA_IMAGEDEPENDS = "u-boot-lsi"
-
-MACHINE_FEATURES += "ext3"
-
-MACHINE_EXTRA_RRECOMMENDS += ""
-
-require conf/machine/include/tune-cortexa15.inc
-
-KERNEL_IMAGETYPE = "zImage"
-UBOOT_ENTRYPOINT = "0x400000"
-KEEPUIMAGE = "no"
-
-SERIAL_CONSOLE = "9600 ttyAMA0"
diff --git a/conf/machine/axm5500.conf b/conf/machine/axm5500.conf
deleted file mode 100644
index e1d84ce..0000000
--- a/conf/machine/axm5500.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#@TYPE: Machine
-#@NAME: axm5500
-#@DESCRIPTION: Machine configuration for LSI AXM5500 systems
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-PREFERRED_VERSION_u-boot-lsi ?= "2013.01.01%"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-lsi"
-#PREFERRED_PROVIDER_virtual/bootemu ?= "u-boot-emu"
-
-#EXTRA_IMAGEDEPENDS = "u-boot-lsi u-boot-emu"
-EXTRA_IMAGEDEPENDS = "u-boot-lsi"
-
-MACHINE_FEATURES += "ext3"
-
-MACHINE_EXTRA_RRECOMMENDS += ""
-
-require conf/machine/include/tune-cortexa15.inc
-
-KARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
-UBOOT_ENTRYPOINT = "0x400000"
-KEEPUIMAGE = "no"
-
-SERIAL_CONSOLE = "9600 ttyAMA0"
diff --git a/conf/machine/axm5500sim.conf b/conf/machine/axm5500sim.conf
deleted file mode 100644
index 78fc0d6..0000000
--- a/conf/machine/axm5500sim.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: axm5500sim
-#@DESCRIPTION: Machine configuration for LSI AXM5500 simulator systems
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-PREFERRED_VERSION_u-boot-lsi ?= "2013.01.01%"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-lsi"
-
-EXTRA_IMAGEDEPENDS = "u-boot-lsi"
-
-MACHINE_FEATURES += "ext3"
-
-MACHINE_EXTRA_RRECOMMENDS += ""
-
-require conf/machine/include/tune-cortexa15.inc
-
-KERNEL_IMAGETYPE = "zImage"
-UBOOT_ENTRYPOINT = "0x400000"
-KEEPUIMAGE = "no"
-
-SERIAL_CONSOLE = "115200 ttyAMA0"
diff --git a/conf/machine/axxiaarm.conf b/conf/machine/axxiaarm.conf
new file mode 100644
index 0000000..d1928f2
--- /dev/null
+++ b/conf/machine/axxiaarm.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: axxiaarm
+#@DESCRIPTION: Machine configuration for LSI Axxia ARM systems
+
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
+PREFERRED_VERSION_u-boot-lsi ?= "2013.01.01%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-lsi"
+
+EXTRA_IMAGEDEPENDS = "u-boot-lsi"
+
+MACHINE_FEATURES += "ext3"
+
+MACHINE_EXTRA_RRECOMMENDS += ""
+
+require conf/machine/include/tune-cortexa15.inc
+
+KARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
+UBOOT_ENTRYPOINT = "0x400000"
+KEEPUIMAGE = "no"
+
+SERIAL_CONSOLE = "9600 ttyAMA0"
diff --git a/conf/machine/axxiapowerpc.conf b/conf/machine/axxiapowerpc.conf
new file mode 100644
index 0000000..a729546
--- /dev/null
+++ b/conf/machine/axxiapowerpc.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: axxiapowerpc
+#@DESCRIPTION: Machine configuration for the LSI Axxia PowerPC systems
+
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
+PREFERRED_VERSION_u-boot-lsi ?= "2010.03%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+
+MACHINE_FEATURES += ""
+
+MACHINE_EXTRA_RRECOMMENDS += ""
+
+require conf/machine/include/tune-ppc476.inc
+
+KARCH = "powerpc"
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x400000"
+KEEPUIMAGE = "no"
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/elpaso.conf b/conf/machine/elpaso.conf
deleted file mode 100644
index 8e0fecd..0000000
--- a/conf/machine/elpaso.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: elpaso
-#@DESCRIPTION: Machine configuration for the LSI elpaso systems
-
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
-PREFERRED_VERSION_u-boot-lsi ?= "2010.03%"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-
-MACHINE_FEATURES += ""
-
-MACHINE_EXTRA_RRECOMMENDS += ""
-
-require conf/machine/include/tune-ppc476.inc
-
-KARCH = "powerpc"
-KERNEL_IMAGETYPE = "uImage"
-UBOOT_ENTRYPOINT = "0x400000"
-KEEPUIMAGE = "no"
-
-SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb b/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
index e26b7be..0c15145 100644
--- a/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
+++ b/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
@@ -3,7 +3,7 @@ require u-boot-lsi.inc
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
-UBOOT_MACHINE_elpaso = "ACP344xV2_stage3_config"
+UBOOT_MACHINE_axxiapowerpc = "ACP344xV2_stage3_config"
SPL_BINARY = ""
diff --git a/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
index 99274fa..becf827 100644
--- a/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
+++ b/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
@@ -3,13 +3,11 @@ require u-boot-lsi.inc
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-UBOOT_MACHINE_axm5500sim = "axxia-55xx_config"
-UBOOT_MACHINE_axm5500 = "axxia-55xx_config"
+UBOOT_MACHINE_axxiaarm = "axxia-55xx_config"
SRCREV = "lsi_axxia_u-boot_5.8.1.44"
PV = "2013.01.01+${SRCREV}"
-#PV = "2013.01.01+${@do_get_tag}"
PR = "r1"
SRC_URI = "git://github.com/lsigithub/lsi_axxia_uboot_public.git"
--
1.8.1.4
More information about the meta-lsi
mailing list