diff --git a/packages/platforms/accton/x86-64/as7726-32x/modules/PKG.yml b/packages/platforms/accton/x86-64/as7726-32x/modules/PKG.yml index fdb63c918..dcb27cb1d 100755 --- a/packages/platforms/accton/x86-64/as7726-32x/modules/PKG.yml +++ b/packages/platforms/accton/x86-64/as7726-32x/modules/PKG.yml @@ -1 +1 @@ -!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7726-32x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64" +!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7726-32x ARCH=amd64 KERNELS="onl-kernel-4.19-lts-x86-64-all:amd64" diff --git a/packages/platforms/accton/x86-64/as7726-32x/modules/builds/Makefile b/packages/platforms/accton/x86-64/as7726-32x/modules/builds/Makefile index 2f5b1a4d9..7bd8d3099 100755 --- a/packages/platforms/accton/x86-64/as7726-32x/modules/builds/Makefile +++ b/packages/platforms/accton/x86-64/as7726-32x/modules/builds/Makefile @@ -1,5 +1,5 @@ -KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64 -KMODULES := $(wildcard *.c) +KERNELS := onl-kernel-4.19-lts-x86-64-all:amd64 +KMODULES := src VENDOR := accton BASENAME := x86-64-accton-as7726-32x ARCH := x86_64 diff --git a/packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/Makefile b/packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/Makefile new file mode 100644 index 000000000..1b5c83ed3 --- /dev/null +++ b/packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/Makefile @@ -0,0 +1,4 @@ +obj-m += x86-64-accton-as7726-32x-cpld.o +obj-m += x86-64-accton-as7726-32x-fan.o +obj-m += x86-64-accton-as7726-32x-leds.o +obj-m += x86-64-accton-as7726-32x-psu.o diff --git a/packages/platforms/accton/x86-64/as7726-32x/modules/builds/x86-64-accton-as7726-32x-cpld.c b/packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/x86-64-accton-as7726-32x-cpld.c similarity index 100% rename from packages/platforms/accton/x86-64/as7726-32x/modules/builds/x86-64-accton-as7726-32x-cpld.c rename to packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/x86-64-accton-as7726-32x-cpld.c diff --git a/packages/platforms/accton/x86-64/as7726-32x/modules/builds/x86-64-accton-as7726-32x-fan.c b/packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/x86-64-accton-as7726-32x-fan.c similarity index 100% rename from packages/platforms/accton/x86-64/as7726-32x/modules/builds/x86-64-accton-as7726-32x-fan.c rename to packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/x86-64-accton-as7726-32x-fan.c diff --git a/packages/platforms/accton/x86-64/as7726-32x/modules/builds/x86-64-accton-as7726-32x-leds.c b/packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/x86-64-accton-as7726-32x-leds.c similarity index 100% rename from packages/platforms/accton/x86-64/as7726-32x/modules/builds/x86-64-accton-as7726-32x-leds.c rename to packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/x86-64-accton-as7726-32x-leds.c diff --git a/packages/platforms/accton/x86-64/as7726-32x/modules/builds/x86-64-accton-as7726-32x-psu.c b/packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/x86-64-accton-as7726-32x-psu.c similarity index 100% rename from packages/platforms/accton/x86-64/as7726-32x/modules/builds/x86-64-accton-as7726-32x-psu.c rename to packages/platforms/accton/x86-64/as7726-32x/modules/builds/src/x86-64-accton-as7726-32x-psu.c diff --git a/packages/platforms/accton/x86-64/as7726-32x/platform-config/r0/src/lib/x86-64-accton-as7726-32x-r0.yml b/packages/platforms/accton/x86-64/as7726-32x/platform-config/r0/src/lib/x86-64-accton-as7726-32x-r0.yml index b5d950f49..75341a964 100755 --- a/packages/platforms/accton/x86-64/as7726-32x/platform-config/r0/src/lib/x86-64-accton-as7726-32x-r0.yml +++ b/packages/platforms/accton/x86-64/as7726-32x/platform-config/r0/src/lib/x86-64-accton-as7726-32x-r0.yml @@ -18,7 +18,7 @@ x86-64-accton-as7726-32x-r0: --stop=1 kernel: - <<: *kernel-4-14 + <<: *kernel-4-19 args: >- nopat diff --git a/packages/platforms/accton/x86-64/as7726-32x/platform-config/r0/src/python/x86_64_accton_as7726_32x_r0/__init__.py b/packages/platforms/accton/x86-64/as7726-32x/platform-config/r0/src/python/x86_64_accton_as7726_32x_r0/__init__.py index bb8e0ac47..addc518a6 100755 --- a/packages/platforms/accton/x86-64/as7726-32x/platform-config/r0/src/python/x86_64_accton_as7726_32x_r0/__init__.py +++ b/packages/platforms/accton/x86-64/as7726-32x/platform-config/r0/src/python/x86_64_accton_as7726_32x_r0/__init__.py @@ -42,7 +42,7 @@ def _8v89307_init(): status, output = commands.getstatusoutput(script) print output if status != 0: - print "Error in 8v89307_init: " + str(e) + print "Error in 8v89307_init: Init failed" return False return True @@ -59,6 +59,8 @@ def baseconfig(self): for m in [ 'cpld', 'fan', 'psu', 'leds' ]: self.insmod("x86-64-accton-as7726-32x-%s.ko" % m) + os.system('modprobe at24') + ########### initialize I2C bus 0 ########### # initialize multiplexer (PCA9548) self.new_i2c_device('pca9548', 0x77, 0)