Cel develop

classes/openbmc_version.bbclass

@@ -18,7 +18,7 @@ def get_openbmc_version(d):
     gitdir = os.path.join(cur, '.git')
     if cur and is_openbmc_root:
         cmd = ['git', '--git-dir=%s' % gitdir , '--work-tree=%s' % cur,
-               'describe', '--tags', '--dirty', '--always']
+               'describe', '--tags', '--always']
         exitstatus, output = oe.utils.getstatusoutput(' '.join(cmd))
         if exitstatus != 0:
             output = ''

common/recipes-core/initscripts/files/hostname.sh

@@ -7,7 +7,7 @@
 # Default-Stop:
 # Short-Description: Set hostname based on /etc/hostname
 ### END INIT INFO
-HOSTNAME="bmc-oob"
+HOSTNAME="bmc"
 
 set_hostname() {
   local name=$1
@@ -46,10 +46,10 @@ update_hostname() {
   fi
 }
 
-if [ -e /mnt/data/hostname ]; then
-  # Use the cached copy to set the hostname
-  HOSTNAME=$(cat /mnt/data/hostname)
-fi
+#if [ -e /mnt/data/hostname ]; then
+#  # Use the cached copy to set the hostname
+#  HOSTNAME=$(cat /mnt/data/hostname)
+#fi
 set_hostname $HOSTNAME
 # Start the update process in the background so
 # we may update the cached copy if it has changed.

meta-aspeed/recipes-bsp/u-boot/files/0001-Support-Celestica-Questone2-and-AS58XX-CL-projects.patch

@@ -1,17 +1,18 @@
-From 073d5a3cc2a94152adac850ee9813284c32ab59e Mon Sep 17 00:00:00 2001
-From: zmzhan <mzhan@celestica.com>
-Date: Mon, 6 Aug 2018 18:31:39 +0800
+From 6f801805c1f29db1b22d12c1b935d79fc15a97fd Mon Sep 17 00:00:00 2001
+From: Xuth <tianhui@celestica.com>
+Date: Fri, 12 Oct 2018 16:02:14 +0800
 Subject: [PATCH] Support Celestica Questone2 and AS58XX-CL projects
 
 ---
  arch/arm/Kconfig                |  11 ++
  board/celestica/Kconfig         |  25 ++++
  board/celestica/MAINTAINERS     |   8 ++
- configs/cel_as58xx-cl_defconfig |  26 +++++
- configs/cel_questone2_defconfig |  26 +++++
- include/configs/cel_as58xx-cl.h | 252 ++++++++++++++++++++++++++++++++++++++++
- include/configs/cel_questone2.h | 252 ++++++++++++++++++++++++++++++++++++++++
- 7 files changed, 600 insertions(+)
+ configs/cel_as58xx-cl_defconfig |  26 ++++
+ configs/cel_questone2_defconfig |  26 ++++
+ drivers/net/aspeednic.c         |  16 +++
+ include/configs/cel_as58xx-cl.h | 261 ++++++++++++++++++++++++++++++++++++++++
+ include/configs/cel_questone2.h | 252 ++++++++++++++++++++++++++++++++++++++
+ 8 files changed, 625 insertions(+)
  create mode 100644 board/celestica/Kconfig
  create mode 100644 board/celestica/MAINTAINERS
  create mode 100644 configs/cel_as58xx-cl_defconfig
@@ -95,7 +96,7 @@ index 0000000..46c2f0e
 +F:	configs/cel_as58xx-cl_defconfig
 diff --git a/configs/cel_as58xx-cl_defconfig b/configs/cel_as58xx-cl_defconfig
 new file mode 100644
-index 0000000..aac79b4
+index 0000000..f607d82
 --- /dev/null
 +++ b/configs/cel_as58xx-cl_defconfig
 @@ -0,0 +1,26 @@
@@ -118,7 +119,7 @@ index 0000000..aac79b4
 +CONFIG_PHYLIB=y
 +CONFIG_NETDEVICES=y
 +CONFIG_DEBUG_UART=y
-+CONFIG_DEBUG_UART_BASE=0x1E78E000
++CONFIG_DEBUG_UART_BASE=0x1E784000
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_SYS_NS16550=y
 +CONFIG_SPI_FLASH=y
@@ -157,12 +158,46 @@ index 0000000..ed9c090
 +CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_SPI_FLASH_MTD=y
 +CONFIG_SYS_PROMPT="Cel-boot=> "
+diff --git a/drivers/net/aspeednic.c b/drivers/net/aspeednic.c
+index 473aee2..8ea8e08 100644
+--- a/drivers/net/aspeednic.c
++++ b/drivers/net/aspeednic.c
+@@ -1114,6 +1114,9 @@ static void aspeednic_probe_phy(struct eth_device *dev)
+
+ 	/* Check if the PHY is up to snuff..., max phy addr is 0x1f */
+ 	for (phy_addr = 0; phy_addr <= 0x1f; phy_addr++) {
++#ifdef CONFIG_CEL_AS58XX_CL
++		phy_addr = CONFIG_BCM54616S_PHY_ADDR;
++#endif
+ 		phy_id = phy_read_register(dev, MII_PHYSID1, phy_addr);
+ 		/*
+ 		 * When it is unable to found PHY,
+@@ -1139,6 +1142,19 @@ static int aspeednic_init(struct eth_device* dev, bd_t* bis)
+
+ 	aspeednic_write_hwaddr(dev);
+
++#ifdef CONFIG_CEL_AS58XX_CL
++	/*configure Gbe PHY 100M auto-nego enable*/
++	phy_write_register(dev, 0x04, 0x0e, 0x01e1);
++	phy_write_register(dev, 0x1c, 0x0e, 0x8804);
++	phy_write_register(dev, 0x1c, 0x0e, 0xb4e3);
++	phy_write_register(dev, 0x1c, 0x0e, 0xb864);
++	
++    phy_write_register(dev, 0x04, 0x0f, 0x01e1);
++	phy_write_register(dev, 0x1c, 0x0f, 0x8804);
++	phy_write_register(dev, 0x1c, 0x0f, 0xb4e3);
++	phy_write_register(dev, 0x1c, 0x0f, 0xb864);
++#endif
++
+ 	for (i = 0; i < NUM_RX_DESC; i++) {
+ 		rx_ring[i].status = cpu_to_le32(RXPKT_RDY);
+ 		rx_ring[i].buf = (u32)(&rx_buffer[i]);
 diff --git a/include/configs/cel_as58xx-cl.h b/include/configs/cel_as58xx-cl.h
 new file mode 100644
-index 0000000..f4ee99c
+index 0000000..3f21d67
 --- /dev/null
 +++ b/include/configs/cel_as58xx-cl.h
-@@ -0,0 +1,252 @@
+@@ -0,0 +1,261 @@
 +/**
 + * (C) Copyright 2018, Celestica Inc.
 + *
@@ -175,15 +210,15 @@ index 0000000..f4ee99c
 +
 +#define CONFIG_SYS_LONGHELP
 +
-+#define CONFIG_BOOTARGS   "debug console=ttyS3,9600n8 root=/dev/ram rw"
++#define CONFIG_BOOTARGS   "debug console=ttyS0,9600n8 root=/dev/ram rw"
 +#define CONFIG_BOOTFILE   "flash-cel_as58xx-cl"
 +
 +/*
 + * Serial configuration
 + */
-+#define CONFIG_SYS_NS16550_COM3 AST_UART3_BASE
-+#define CONFIG_CONS_INDEX       3
-+#define CONFIG_ASPEED_COM       AST_UART3_BASE
++#define CONFIG_SYS_NS16550_COM1 AST_UART0_BASE
++#define CONFIG_CONS_INDEX       1
++#define CONFIG_ASPEED_COM       AST_UART0_BASE
 +#define CONFIG_BAUDRATE         9600
 +
 +/*
@@ -196,15 +231,24 @@ index 0000000..f4ee99c
 +#define CONFIG_ASPEED_UART3_ENABLE
 +#define CONFIG_ASPEED_UART4_ENABLE
 +#define CONFIG_ASPEED_UART5_MAP_IO6
++#define CONFIG_DRAM_UART_TO_UART3
 +
 +/*
 + * NIC configuration
 + */
++#define CONFIG_BCM54616S_PHY_ADDR      0xd
 +#define CONFIG_MAC2_ENABLE
 +#define CONFIG_MAC1_PHY_SETTING     0
 +#define CONFIG_MAC2_PHY_SETTING     0
 +#define CONFIG_ASPEED_MAC_NUMBER  2
 +#define CONFIG_ASPEED_MAC_CONFIG  2
++#define _PHY_SETTING_CONCAT(mac) CONFIG_MAC##mac##_PHY_SETTING
++#define _GET_MAC_PHY_SETTING(mac) _PHY_SETTING_CONCAT(mac)
++#define CONFIG_ASPEED_MAC_PHY_SETTING \
++  _GET_MAC_PHY_SETTING(CONFIG_ASPEED_MAC_CONFIG)
++#define CONFIG_MAC_INTERFACE_CLOCK_DELAY    0x2255
++#define CONFIG_RANDOM_MACADDR
++
 +
 +/*
 + * Watchdog configuration

meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb

@@ -8,7 +8,7 @@ DEPENDS = "mtd-utils"
 SRCBRANCH = "openbmc/helium/v2016.07"
 SRCREV = "AUTOINC"
 
-SRC_URI = "git://github.com/theopolis/u-boot.git;branch=${SRCBRANCH};protocol=https \
+SRC_URI = "git://github.com/SW-CSA/u-boot.git;branch=${SRCBRANCH};protocol=https \
            file://fw_env.config \
            file://0001-Support-Celestica-Questone2-and-AS58XX-CL-projects.patch \
           "

meta-aspeed/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb

@@ -8,7 +8,7 @@ DEPENDS = "openssl"
 SRCBRANCH = "openbmc/helium/v2016.07"
 SRCREV = "AUTOINC"
 
-SRC_URI = "git://github.com/theopolis/u-boot.git;branch=${SRCBRANCH};protocol=https \
+SRC_URI = "git://github.com/SW-CSA/u-boot.git;branch=${SRCBRANCH};protocol=https \
            file://fw_env.config \
           "
 

meta-aspeed/recipes-bsp/u-boot/u-boot_2016.07.bb

@@ -11,7 +11,7 @@ DEPENDS += "dtc-native bc-native"
 SRCBRANCH = "openbmc/helium/v2016.07"
 SRCREV = "AUTOINC"
 
-SRC_URI = "git://github.com/theopolis/u-boot.git;branch=${SRCBRANCH};protocol=https \
+SRC_URI = "git://github.com/SW-CSA/u-boot.git;branch=${SRCBRANCH};protocol=https \
            file://fw_env.config \
            file://fw_env.config.full \
            file://0001-Support-Celestica-Questone2-and-AS58XX-CL-projects.patch \

meta-aspeed/recipes-kernel/linux/linux-aspeed_4.1.bb

@@ -2,7 +2,7 @@
 SRCBRANCH = "openbmc/helium/4.1"
 SRCREV = "AUTOINC"
 
-SRC_URI = "git://github.com/theopolis/linux.git;branch=${SRCBRANCH};protocol=https \
+SRC_URI = "git://github.com/SW-CSA/linux.git;branch=${SRCBRANCH};protocol=https \
           "
 
 LINUX_VERSION ?= "4.1.51"

meta-celestica/meta-as58xx-cl/conf/bblayers.conf.sample

@@ -17,6 +17,7 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   ##OEROOT##/../../../meta-celestica \
+  ##OEROOT##/../../../meta-celestica/meta-python3 \
   ##OEROOT##/../../../meta-celestica/meta-as58xx-cl \
   "
 

meta-celestica/meta-as58xx-cl/conf/local.conf.sample

@@ -8,3 +8,4 @@ MACHINE ??= "as58xx-cl"
 # OpenBMC distro settings
 DISTRO ?= "openbmc-fb"
 
+DEFAULT_TIMEZONE = "Asia/Shanghai"

meta-celestica/meta-as58xx-cl/conf/templateconf.cfg

@@ -0,0 +1 @@
+/home/zmzhan/workstations/openbmc/AS58xx-CL/SW_CSA/2018_09_21/openbmc/meta-celestica/meta-as58xx-cl/conf//conf

meta-celestica/meta-as58xx-cl/recipes-core/busybox/busybox/busybox.cfg

@@ -0,0 +1,47 @@
+CONFIG_SH_MATH_SUPPORT_64=y
+CONFIG_DEVMEM=y
+CONFIG_LSUSB=y
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
+CONFIG_RX=y
+CONFIG_FLASHCP=y
+CONFIG_FLASH_LOCK=y
+CONFIG_FLASH_UNLOCK=y
+CONFIG_FLASH_ERASEALL=y
+CONFIG_TRACEROUTE6=y
+CONFIG_VCONFIG=y
+# we use the standalone ip util
+CONFIG_IP=n
+# use dhclient, as udhcpc will flush all v6 link local addresses during renew
+CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
+CONFIG_UDHCPD=n
+CONFIG_UDHCPC=n
+CONFIG_UDHCPC6=n
+
+# runit
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+CONFIG_SV=y
+CONFIG_SV_DEFAULT_SERVICE_DIR="/etc/sv"
+CONFIG_SVLOGD=y
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+
+#crond
+CONFIG_CROND=y
+CONFIG_CRONTAB=y
+
+# cov's favorites
+CONFIG_BASE64=y
+CONFIG_CKSUM=y
+CONFIG_SHA512=y
+CONFIG_TAC=y
+CONFIG_CHPASSWD=y
+CONFIG_NC_SERVER=y
+CONFIG_PKILL=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=n
+CONFIG_TIMEOUT=y
+
+CONFIG_WATCHDOG=y

meta-celestica/meta-as58xx-cl/recipes-core/busybox/busybox_%.bbappend

@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+            file://busybox.cfg \
+           "

meta-celestica/meta-as58xx-cl/recipes-core/fan-ctrl/fan-ctrl/Makefile

@@ -15,12 +15,21 @@
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA
 
-all: fand
+all: fand fand_v2 fand32_v2 fand_phalanx
 
 fand: fand.cpp watchdog.cpp
 	$(CXX) $(CXXFLAGS) -pthread -o $@ $^ $(LDFLAGS)
 
+fand_v2: fand_v2.cpp watchdog.cpp
+	$(CXX) $(CXXFLAGS) -pthread -o $@ $^ $(LDFLAGS)
+
+fand32_v2: fand32_v2.cpp watchdog.cpp
+	$(CXX) $(CXXFLAGS) -pthread -o $@ $^ $(LDFLAGS)
+
+fand_phalanx: fand_phalanx.cpp watchdog.cpp
+	$(CXX) $(CXXFLAGS) -pthread -o $@ $^ $(LDFLAGS)
+
 .PHONY: clean
 
 clean:
-	rm -rf *.o fand
+	rm -rf *.o fand fand_v2 fand32_v2 fand_phalanx