support for sda3016ss
Change-Id: Id86e26e2389455e04173a1568b503d3bd77dac6d
diff --git a/agent/Makefile.in b/agent/Makefile.in
index ab9de52..494bc81 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -36,6 +36,9 @@
DEV_VER = 20211129
# Version of Open Network Linux (ONL).
ONL_KERN_VER_MAJOR = 4.19
+else ifeq ("$(strip $(OPENOLTDEVICE))","sda3016ss")
+BAL_VER = 3.10.0.0
+DEV_VER = 20220425
else
DEV_VER = 202111040101
API_VER = 202111090101
@@ -135,19 +138,33 @@
##
ONL_REPO = onl
ONL_DIR = $(BUILD_DIR)/$(ONL_REPO)
+ONL_COMMIT_ID = 11ed2140
onl:
if [ ! -d "$(ONL_DIR)/OpenNetworkLinux" ]; then \
mkdir -p $(ONL_DIR); \
git clone https://github.com/opencomputeproject/OpenNetworkLinux.git $(ONL_DIR)/OpenNetworkLinux; \
- cp download/Makefile.onl $(ONL_DIR)/Makefile; \
- install -m 755 download/build-onl.sh $(ONL_DIR)/OpenNetworkLinux; \
- cp download/disable-certificate-validation*.patch $(ONL_DIR)/OpenNetworkLinux; \
- if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ] || [ "$(OPENOLTDEVICE)" = "rlt-1600g-w" ] || [ "$(OPENOLTDEVICE)" = "rlt-1600x-w" ]; \
- then \
- cp $(TOP_DIR)/device/$(OPENOLTDEVICE)/update_kernel_options.sh $(ONL_DIR)/OpenNetworkLinux/.; \
- chmod 0755 $(ONL_DIR)/OpenNetworkLinux/update_kernel_options.sh; \
+ if [ "$(OPENOLTDEVICE)" = "sda3016ss" ]; then \
+ tar zxvf download/onl_zyxel_sda3016ss.tar.gz -C $(ONL_DIR)/OpenNetworkLinux; \
+ cp download/onl_workaround.patch $(ONL_DIR)/OpenNetworkLinux; \
+ cd $(ONL_DIR)/OpenNetworkLinux; \
+ git checkout $(ONL_COMMIT_ID); \
+ git apply --whitespace=nowarn onl_zyxel_sda3016ss.patch; \
+ git apply --whitespace=nowarn onl_workaround.patch; \
+ export VERSION=8; \
+ make docker; \
+ cd packages/base/amd64/kernels/kernel-4.19-lts-x86-64-all/builds/jessie; tar zcf linux-4.19.81.tgz linux-4.19.81; \
+ mv $(BUILD_DIR)/$(ONL_REPO)/OpenNetworkLinux/packages/base/amd64/kernels/kernel-4.19-lts-x86-64-all/builds/jessie/linux-4.19.81.tgz download/; \
+ else \
+ cp download/Makefile.onl $(ONL_DIR)/Makefile; \
+ install -m 755 download/build-onl.sh $(ONL_DIR)/OpenNetworkLinux; \
+ cp download/disable-certificate-validation*.patch $(ONL_DIR)/OpenNetworkLinux; \
+ if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ] || [ "$(OPENOLTDEVICE)" = "rlt-1600g-w" ] || [ "$(OPENOLTDEVICE)" = "rlt-1600x-w" ]; \
+ then \
+ cp $(TOP_DIR)/device/$(OPENOLTDEVICE)/update_kernel_options.sh $(ONL_DIR)/OpenNetworkLinux/.; \
+ chmod 0755 $(ONL_DIR)/OpenNetworkLinux/update_kernel_options.sh; \
+ fi; \
+ make -C $(ONL_DIR) onl-$(ONL_KERN_VER_MAJOR) INBAND=n BOARD=$(OPENOLTDEVICE); \
fi; \
- make -C $(ONL_DIR) onl-$(ONL_KERN_VER_MAJOR) INBAND=n BOARD=$(OPENOLTDEVICE); \
else \
if [ "$(INBAND)" = n -a "$$(grep "inband" $(ONL_DIR)/onl_build.mode | cut -d= -f 2)" = y ]; then \
make -C $(ONL_DIR) onl-$(ONL_KERN_VER_MAJOR) INBAND=n; \
@@ -212,7 +229,7 @@
#
# Choose api type: open api (api-oss) or proprietary api (api-nda-req)
BAL_API_TYPE = api-oss
-#BAL_API_TYPE = api-nda-req
+#BAL_API_TYPE = api-nda_req
########################################################################
##
@@ -224,6 +241,27 @@
BALLIBDIR = $(BUILD_DIR)
BALLIBNAME = bal_host_$(BAL_API_TYPE)
BAL_INC = -I$(BAL_API_DIR)/include
+ifeq ("$(strip $(OPENOLTDEVICE))","sda3016ss")
+BALLIBDIR = $(BAL_DIR)/build/host_reference/host_api
+BAL_INC += -I$(BAL_DIR)/host_driver/bal/bal_include \
+ -I$(BAL_DIR)/host_driver/topology \
+ -I$(BAL_DIR)/host_driver/utils \
+ -I$(BAL_DIR)/host_driver/api \
+ -I$(BAL_DIR)/host_driver/metadata \
+ -I$(BAL_DIR)/host_customized/os_abstraction \
+ -I$(BAL_DIR)/host_customized/os_abstraction/posix \
+ -I$(BAL_DIR)/host_customized/config \
+ -I$(BAL_DIR)/host_driver/api_conn_mgr \
+ -I$(BAL_DIR)/host_driver/conn_mgr \
+ -I$(BAL_DIR)/host_driver/api/host/topology \
+ -I$(BAL_DIR)/host_driver/system_types \
+ -I$(BAL_DIR)/host_driver/transport \
+ -I$(BAL_DIR)/host_reference/cli \
+ -I$(BAL_DIR)/host_reference/api_cli \
+ -I$(BAL_DIR)/host_reference/dev_log \
+ -I$(BAL_DIR)/host_reference/host_api \
+ -I$(BAL_DIR)/lib/cmdline
+endif
CXXFLAGS += $(BAL_INC)
CXXFLAGS += -DBCMOS_MSG_QUEUE_DOMAIN_SOCKET -DBCMOS_MSG_QUEUE_UDP_SOCKET -DBCMOS_MEM_CHECK -DBCMOS_SYS_UNITTEST -DENABLE_LOG -DENABLE_CLI
PORT_SPEED_FILE = $(BAL_DIR)/switch_sdk/$(SDK_VER)/rc/$(OPENOLTDEVICE)/board_files/broadcom/port_speed.soc
@@ -247,6 +285,7 @@
RADISYS_PATCH = RADISYS_BAL_$(BAL_VER)_V$(DEV_VER).patch
BROADCOM_IP_PATCH = ACCTON_BAL_$(BAL_VER)-V$(DEV_VER)-BROADCOM-IP.patch
BCM_SWITCH_SDK = $(BAL_DIR)/switch_sdk/$(SDK_VER)
+ZYXEL_PATCH = ZYXEL_BAL_$(BAL_VER)_V$(DEV_VER).patch
sdk: onl
ifeq ("$(wildcard $(BAL_DIR))","")
@@ -256,6 +295,9 @@
chmod -R 744 $(BAL_DIR)
ifeq ("$(strip $(OPENOLTDEVICE))",$(findstring "$(strip $(OPENOLTDEVICE))", "rlt-3200g-w" "rlt-1600g-w" "rlt-1600x-w"))
cat download/$(RADISYS_PATCH) | patch -p1 -d $(BAL_DIR)
+else ifeq ("$(strip $(OPENOLTDEVICE))","sda3016ss")
+ tar zxf download/sda3016ss_rootfs.tar.gz -C $(BAL_DIR)
+ cat download/$(ZYXEL_PATCH) | patch -p1 -d $(BAL_DIR)
else
cat download/$(ACCTON_PATCH) | patch -p1 -d $(BAL_DIR)
cat download/$(BROADCOM_IP_PATCH) | patch -p1 -d $(BAL_DIR)
@@ -273,6 +315,13 @@
chmod 0755 $(BCM_SWITCH_SDK)/sdk_patches_apply.sh
make -C $(BAL_DIR) BOARD=radisys ONL=$(TOP_DIR)/$(ONL_DIR)/OpenNetworkLinux ONL_DEBIAN_SUITE=$(shell lsb_release -c -s)
make -C $(BAL_DIR) BOARD=radisys release_board
+else ifeq ("$(strip $(OPENOLTDEVICE))","sda3016ss")
+ cp download/Dockerfile $(BAL_DIR)
+ tar zxf download/linux-4.19.81.tgz -C $(BAL_DIR)
+ docker build $(BAL_DIR) -t tt_ub18
+ docker run -v $(TOP_DIR)/$(BAL_DIR):/mnt -w /mnt tt_ub18 bash -c 'make'
+ cp download/sda3016_nni_init.conf $(BAL_DIR)/sda3016ss_rootfs/opt/bcm68620/
+ docker run -v $(TOP_DIR)/$(BAL_DIR):/mnt -w /mnt tt_ub18 bash -c 'make release_board'
else
make -C $(BAL_DIR) BOARD=$(OPENOLTDEVICE) ONL_DIR=$(TOP_DIR)/$(ONL_DIR)/OpenNetworkLinux
make -C $(BAL_DIR) BOARD=$(OPENOLTDEVICE) release_board
@@ -280,8 +329,11 @@
endif
bal-clean:
+ifeq ("$(strip $(OPENOLTDEVICE))","sda3016ss")
+ docker run -v $(TOP_DIR)/$(BAL_DIR):/mnt -w /mnt tt_ub18 bash -c 'make clean_all'
+else
make -C $(BAL_DIR) BOARD=$(OPENOLTDEVICE) clean_all
-
+endif
########################################################################
##
##
@@ -338,9 +390,25 @@
ANSIBLE_DIR = /etc/ansible
OBJS = $(SRCS:.cc=.o)
DEPS = $(SRCS:.cc=.d)
+ZYXEL_DOCKER_PATCH = ZYXEL_Docker_V$(DEV_VER).patch
+
+ifeq ("$(strip $(OPENOLTDEVICE))","sda3016ss")
+PREREQ = sdk
+else
+PREREQ = $(BUILD_DIR)/lib$(BALLIBNAME).so sdk protos $(OBJS)
+endif
.DEFAULT_GOAL := all
all: $(BUILD_DIR)/openolt
-$(BUILD_DIR)/openolt: $(BUILD_DIR)/lib$(BALLIBNAME).so sdk protos $(OBJS)
+$(BUILD_DIR)/openolt: $(PREREQ)
+ifeq ("$(strip $(OPENOLTDEVICE))","sda3016ss")
+ if [ ! -f "Dockerfile" ]; then \
+ git apply --whitespace=nowarn download/$(ZYXEL_DOCKER_PATCH); \
+ fi;
+ if !(docker images | grep -q onl-builder-8-openolt); then \
+ docker build . -t onl-builder-8-openolt; \
+ fi;
+ docker/tools/onlbuilder -8 --isolate -c make -C agent OPENOLTDEVICE=sda3016ss openolt-in-docker
+else
$(CXX) $(LDFLAGS) -L$(BALLIBDIR) $(OBJS) $(OPENOLT_API_LIB) $(LIBPROTOBUF_PATH)/libprotobuf.a -o $@ -l$(BALLIBNAME) $(shell pkg-config --libs protobuf grpc++ grpc) $(PCAPPLUSPLUS_LIB_PATH)
ifeq ("$(strip $(OPENOLTDEVICE))",$(findstring "$(strip $(OPENOLTDEVICE))", "rlt-3200g-w" "rlt-1600g-w" "rlt-1600x-w"))
ln -sf $(TOP_DIR)/$(BAL_DIR)/build/fs/radisys/release/release_radisys_v$(BAL_VER).tar.gz $(BUILD_DIR)/release_$(OPENOLTDEVICE)_V$(BAL_VER).$(DEV_VER).tar.gz
@@ -356,11 +424,32 @@
make deb; \
make inband-onl; \
fi;
+endif
+
+openolt-in-docker: protos $(OBJS)
+ $(CXX) $(LDFLAGS) -L$(BALLIBDIR) $(OBJS) $(OPENOLT_API_LIB) $(LIBPROTOBUF_PATH)/libprotobuf.a -o $(BUILD_DIR)/openolt -l$(BALLIBNAME) $(shell pkg-config --libs protobuf grpc++ grpc) $(PCAPPLUSPLUS_LIB_PATH)
+ ln -sf $(TOP_DIR)/$(BAL_DIR)/release_$(OPENOLTDEVICE)_V$(BAL_VER)-$(DEV_VER).tar.gz $(BUILD_DIR)/.
+ ln -sf $(TOP_DIR)/$(BAL_DIR)/build/host_reference/host_api/strip/libbal_host_$(BAL_API_TYPE).so $(BUILD_DIR)/.
+ ln -sf $(TOP_DIR)/$(BAL_DIR)/build/host_driver/dev_mgmt_daemon/dev_mgmt_daemon $(BUILD_DIR)/.
+ ln -sf $(LIBGRPC_PATH)/libz.so.1 $(BUILD_DIR)/libz.so.1
+ ln -sf /usr/lib/x86_64-linux-gnu/libstdc++.so.6 $(BUILD_DIR)/libstdc++.so.6
+ strip $(BUILD_DIR)/openolt
+ echo "inband=n" > $(ONL_DIR)/onl_build.mode
+ mkdir -p tmp/opt/openolt
+ cp build/libbal_host_$(BAL_API_TYPE).so build/openolt tmp/opt/openolt
+ tar zcf build/release_$(OPENOLTDEVICE)_openolt_V$(BAL_VER)-$(DEV_VER).tar.gz tmp/
+ rm -rf tmp
src/%.o: src/%.cc
$(CXX) $(CXXFLAGS) $(CXXFLAGSDEVICE) $(CPPFLAGS) -I./common -c $< -o $@
deb: rxtx-power
+ifeq ("$(strip $(OPENOLTDEVICE))","sda3016ss")
+ mkdir -p device/$(OPENOLTDEVICE)/mkdebian/tmp
+ cp download/release_$(OPENOLTDEVICE)_custom_V2.0.0.1-$(DEV_VER).tar.gz device/$(OPENOLTDEVICE)/mkdebian/tmp
+ cp $(BUILD_DIR)/release_$(OPENOLTDEVICE)_V$(BAL_VER)-$(DEV_VER) device/$(OPENOLTDEVICE)/mkdebian/tmp
+ cp $(BUILD_DIR)/release_$(OPENOLTDEVICE)_openolt_V$(BAL_VER)-$(DEV_VER).tar.gz device/$(OPENOLTDEVICE)/mkdebian/tmp
+else
cp $(BUILD_DIR)/release_$(OPENOLTDEVICE)_V$(BAL_VER).$(DEV_VER).tar.gz device/$(OPENOLTDEVICE)/mkdebian/debian
cp $(BUILD_DIR)/openolt device/$(OPENOLTDEVICE)/mkdebian/debian
cp $(BUILD_DIR)/libz.so.1 device/$(OPENOLTDEVICE)/mkdebian/debian
@@ -368,10 +457,11 @@
cp $(BUILD_DIR)/libbal_host_api-oss.so device/$(OPENOLTDEVICE)/mkdebian/debian
cp -a scripts/init.d device/$(OPENOLTDEVICE)/mkdebian/debian
cp -a $(RXTX_POWER_EXE) device/$(OPENOLTDEVICE)/mkdebian/debian
+ cp -a scripts/watchdog device/$(OPENOLTDEVICE)/mkdebian/debian
+endif
ifeq ("$(strip $(OPENOLTDEVICE))",$(findstring "$(strip $(OPENOLTDEVICE))", "rlt-3200g-w" "rlt-1600g-w" "rlt-1600x-w"))
sed -i '/\/opt\/bcm68650\/svk_init.sh/c\ \/opt\/bcm68650\/svk_init.sh -qsfp_speed=$(PORT_QSFP_SPEED) -sfp_speed=$(PORT_SFP_SPEED)' device/$(OPENOLTDEVICE)/mkdebian/debian/init.d/dev_mgmt_daemon
endif
- cp -a scripts/watchdog device/$(OPENOLTDEVICE)/mkdebian/debian
cd device/$(OPENOLTDEVICE)/mkdebian && ./build_$(OPENOLTDEVICE)_deb.sh
mv device/$(OPENOLTDEVICE)/$(OPENOLTDEVICE)_*.deb $(BUILD_DIR)/openolt_$(OPENOLTDEVICE)-$(VERSION)-$(LABEL_VCS_REF).deb
make deb-cleanup
@@ -444,6 +534,7 @@
@rm -f device/$(OPENOLTDEVICE)/$(OPENOLTDEVICE)_$(BAL_VER)+edgecore-V$(DEV_VER)_amd64.changes
@rm -f device/$(OPENOLTDEVICE)/mkdebian/debian/$(RXTX_POWER_EXE)
@rm -rf device/$(OPENOLTDEVICE)/mkdebian/debian/watchdog/
+ @rm -rf device/$(OPENOLTDEVICE)/mkdebian/tmp/
inband-onl-cleanup:
@rm -f $(ONL_DIR)/OpenNetworkLinux/*.patch