diff --git a/Makefile b/Makefile
index c183f82e..acde00a8 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ $(foreach a,$(ALL_ARCHES),$(eval $(call build_arch_template,$(a))))
 # Available build architectures based on the current suite
 BUILD_ARCHES_wheezy := amd64 powerpc
 BUILD_ARCHES_jessie := $(ALL_ARCHES)
-BUILD_ARCHES_stretch := amd64
+BUILD_ARCHES_stretch := arm64 amd64
 
 # Build available architectures by default.
 .DEFAULT_GOAL := all
diff --git a/make/kbuild.mk b/make/kbuild.mk
index 7fdfd7ac..12052db8 100644
--- a/make/kbuild.mk
+++ b/make/kbuild.mk
@@ -188,14 +188,16 @@ mbuild: build
 	find $(K_MBUILD_DIR) -name "*.o*" -delete
 	find $(K_MBUILD_DIR) -name "*.c" -delete
 	find $(K_MBUILD_DIR) -name "*.ko" -delete
+ifeq ($(ARCH), powerpc)
 	$(foreach f,$(MODSYNCKEEP), cp $(K_SOURCE_DIR)/$(f) $(K_MBUILD_DIR)/$(f) || true;)
+endif
 
 dtbs: mbuild
 ifdef DTS_LIST
 	rm -rf $(K_DTBS_DIR)
 	mkdir -p $(K_DTBS_DIR)
 ifeq ($(ARCH),arm64)
-	cp $(K_SOURCE_DIR)/arch/$(ARCH)/boot/dts/*.dtb $(K_DTBS_DIR)
+	cp $(K_SOURCE_DIR)/arch/$(ARCH)/boot/dts/freescale/*.dtb $(K_DTBS_DIR)
 else
 	$(foreach name,$(DTS_LIST),$(K_SOURCE_DIR)/scripts/dtc/dtc -I dts -O dtb -o $(K_DTBS_DIR)/$(name).dtb $(K_SOURCE_DIR)/arch/$(ARCH)/boot/dts/$(name).dts; )
 endif
diff --git a/packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile b/packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile
index ba4ed0ff..161e3f14 100644
--- a/packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile
+++ b/packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile
@@ -15,7 +15,7 @@ K_PATCH_SERIES=series.arm64
 
 include ../../kconfig.mk
 K_CONFIG := arm64-all.config
-K_BUILD_TARGET := Image Image.gz freescale/fsl-ls1043a-rdb.dtb  freescale/fsl-ls1046a-rdb.dtb freescale/fsl-ls2080a-rdb.dtb freescale/fsl-ls2088a-rdb.dtb freescale/fsl-ls1088a-rdb.dtb
+K_BUILD_TARGET := Image Image.gz freescale/fsl-ls1043a-rdb-sdk.dtb  freescale/fsl-ls1046a-rdb-sdk.dtb freescale/fsl-ls2080a-rdb.dtb freescale/fsl-ls2088a-rdb.dtb freescale/fsl-ls1088a-rdb.dtb
 K_COPY_SRC := arch/arm64/boot/Image
 K_COPY_GZIP := 1
 ifndef K_COPY_DST
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/.gitignore b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/.gitignore
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/.gitignore
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/.gitignore
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/.module b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/.module
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/.module
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/.module
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/Makefile b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/Makefile
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/arm64_nxp_layerscape.doxy b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/arm64_nxp_layerscape.doxy
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/arm64_nxp_layerscape.doxy
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/arm64_nxp_layerscape.doxy
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/arm64_nxp_layerscape.mk b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/arm64_nxp_layerscape.mk
similarity index 91%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/arm64_nxp_layerscape.mk
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/arm64_nxp_layerscape.mk
index e83e2347..93408847 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/arm64_nxp_layerscape.mk
+++ b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/arm64_nxp_layerscape.mk
@@ -3,7 +3,7 @@
 #
 # Inclusive Makefile for the arm64_nxp_layerscape module.
 #
-# Autogenerated 2017-12-18 11:06:48.148999
+# Autogenerated 2018-04-23 06:15:46.784359
 #
 ###############################################################################
 arm64_nxp_layerscape_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/auto/arm64_nxp_layerscape.yml b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/auto/arm64_nxp_layerscape.yml
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/auto/arm64_nxp_layerscape.yml
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/auto/arm64_nxp_layerscape.yml
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/auto/make.mk b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/auto/make.mk
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/auto/make.mk
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/auto/make.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape.x b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape.x
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape.x
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape.x
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_config.h b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_config.h
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_config.h
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_config.h
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_dox.h b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_dox.h
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_dox.h
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_dox.h
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_porting.h b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_porting.h
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_porting.h
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/inc/arm64_nxp_layerscape/arm64_nxp_layerscape_porting.h
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/make.mk b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/make.mk
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/make.mk
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/make.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/Makefile b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/Makefile
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_config.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_config.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_config.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_config.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_enums.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_enums.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_enums.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_enums.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_int.h b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_int.h
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_int.h
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_int.h
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_log.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_log.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_log.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_log.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_log.h b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_log.h
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_log.h
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_log.h
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_module.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_module.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_module.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_module.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_ucli.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_ucli.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/arm64_nxp_layerscape_ucli.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/arm64_nxp_layerscape_ucli.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/fani.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/fani.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/fani.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/fani.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/ledi.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/ledi.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/ledi.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/ledi.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/make.mk b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/make.mk
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/make.mk
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/make.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/psui.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/psui.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/psui.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/psui.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/sfpi.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/sfpi.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/sfpi.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/sfpi.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/sysi.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/sysi.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/sysi.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/sysi.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/thermali.c b/packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/thermali.c
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/module/src/thermali.c
rename to packages/platforms/nxp/arm64/any/arm64-nxp-layerscape/module/src/thermali.c
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/modules/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-layerscape/modules/PKG.yml
deleted file mode 100644
index 9b48f087..00000000
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/modules/PKG.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-prerequisites:
-  packages:
-    - "onl-vendor-nxp-modules:arm64"
-
-common:
-  version: 1.0.0
-  arch: arm64
-  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
-  maintainer: support@bigswitch.com
-  support: opennetworklinux@googlegroups.com
-  
-
-packages:
-  - name: onl-platform-modules-arm64-nxp-ls2088ardb
-    summary: ONL Platform Modules Package for the arm64-nxp-ls2088ardb
-    depends: onl-vendor-nxp-modules
-    changelog: Changes
-
-  - name: onl-platform-modules-arm64-nxp-ls1043ardb
-    summary: ONL Platform Modules Package for the arm64-nxp-ls1043ardb
-    depends: onl-vendor-nxp-modules
-    changelog: Changes
-
-  - name: onl-platform-modules-arm64-nxp-ls1046ardb
-    summary: ONL Platform Modules Package for the arm64-nxp-ls1046ardb
-    depends: onl-vendor-nxp-modules
-    changelog: Changes
-
-  - name: onl-platform-modules-arm64-nxp-ls1088ardb
-    summary: ONL Platform Modules Package for the arm64-nxp-ls1088ardb
-    depends: onl-vendor-nxp-modules
-    changelog: Changes
-
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/PKG.yml
deleted file mode 100644
index 610618d6..00000000
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/PKG.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-variables:
-  platformbase: arm64-nxp-layerscape
-  ls2088_platform: arm64-nxp-ls2088ardb
-  ls1043_platform: arm64-nxp-ls1043ardb
-  ls1046_platform: arm64-nxp-ls1046ardb
-  ls1088_platform: arm64-nxp-ls1088ardb
-
-  ls2088_install: /lib/platform-config/arm64-nxp-ls2088ardb-r0/onl
-  ls1043_install: /lib/platform-config/arm64-nxp-ls1043ardb-r0/onl
-  ls1046_install: /lib/platform-config/arm64-nxp-ls1046ardb-r0/onl
-  ls1088_install: /lib/platform-config/arm64-nxp-ls1088ardb-r0/onl
-
-common:
-  version: 1.0.0
-  arch: arm64
-  copyright: Copyright 2016 NXP Semiconductor, Inc.
-  maintainer: support@bigswitch.com
-  changelog:  Change changes changes.,
-
-
-packages:
-  - name: onlp-arm64-nxp-ls2088ardb-r0
-    summary: ONLP Package for the arm64-nxp-ls2088ardb-r0 platform.
-
-    files:
-      builds/lib/$BUILD_DIR/aarch64-linux-gnu/bin/libonlp-${platformbase}.so : ${ls2088_install}/lib/libonlp-${ls2088_platform}.so
-      builds/onlpdump/$BUILD_DIR/aarch64-linux-gnu/bin/onlpdump : ${ls2088_install}/bin/
-
-
-  - name: onlp-arm64-nxp-ls1043ardb-r0
-    summary: ONLP Package for the arm64-nxp-ls1043ardb-r0 platform.
-
-    files:
-      builds/lib/$BUILD_DIR/aarch64-linux-gnu/bin/libonlp-${platformbase}.so : ${ls1043_install}/lib/libonlp-${ls1043_platform}.so
-      builds/onlpdump/$BUILD_DIR/aarch64-linux-gnu/bin/onlpdump : ${ls1043_install}/bin/
-
-
-  - name: onlp-arm64-nxp-ls1046ardb-r0
-    summary: ONLP Package for the arm64-nxp-ls1046ardb-r0 platform.
-
-    files:
-      builds/lib/$BUILD_DIR/aarch64-linux-gnu/bin/libonlp-${platformbase}.so : ${ls1046_install}/lib/libonlp-${ls1046_platform}.so
-      builds/onlpdump/$BUILD_DIR/aarch64-linux-gnu/bin/onlpdump : ${ls1046_install}/bin/
-
-  - name: onlp-arm64-nxp-ls1088ardb-r0
-    summary: ONLP Package for the arm64-nxp-ls1088ardb-r0 platform.
-
-    files:
-      builds/lib/$BUILD_DIR/aarch64-linux-gnu/bin/libonlp-${platformbase}.so : ${ls1088_install}/lib/libonlp-${ls1088_platform}.so
-      builds/onlpdump/$BUILD_DIR/aarch64-linux-gnu/bin/onlpdump : ${ls1088_install}/bin/
-
-
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/.gitignore b/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/.gitignore
deleted file mode 100644
index 67da8c7d..00000000
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/src/arm64_nxp_layerscape/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/arm64_nxp_ls2080ardb.mk
-/doc
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/PKG.yml
deleted file mode 100644
index 5108c632..00000000
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/PKG.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-############################################################
-#
-# PKG template for all platform-config packages.
-#
-############################################################
-variables:
-  LS2088: arm64-nxp-ls2088ardb-r0
-  LS1043: arm64-nxp-ls1043ardb-r0
-  LS1046: arm64-nxp-ls1046ardb-r0
-  LS1088: arm64-nxp-ls1088ardb-r0
-
-prerequisites:
-  packages:
-    - "onl-vendor-config-nxp:all"
-    - "onl-platform-modules-arm64-nxp-ls2088ardb:arm64"
-    - "onl-platform-modules-arm64-nxp-ls1043ardb:arm64"
-    - "onl-platform-modules-arm64-nxp-ls1046ardb:arm64"
-    - "onl-platform-modules-arm64-nxp-ls1088ardb:arm64"
-
-common:
-  version: 1.0.0
-  arch: arm64
-  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
-  maintainer: support@bigswitch.com
-  support: opennetworklinux@googlegroups.com
-  changelog: None
-
-packages:
-  - name: onl-platform-config-$LS2088
-    depends: onl-vendor-config-nxp,onl-platform-modules-arm64-nxp-ls2088ardb
-    summary: ONL Platform Configuration Package for the $LS2088
-
-    files:
-      src/lib/arm64-nxp-ls2088ardb-r0.yml: /lib/platform-config/$LS2088/onl/arm64-nxp-ls2088ardb-r0.yml
-      src/python/arm64_nxp_ls2088ardb_r0 : ${PY_INSTALL}/onl/platform/arm64_nxp_ls2088ardb_r0
-
-  - name: onl-platform-build-$LS2088
-    summary: ONL Platform Build Package for the $LS2088
-    optional-files:
-      builds: $$PKG_INSTALL
-
-  - name: onl-platform-config-$LS1043
-    depends: onl-vendor-config-nxp,onl-platform-modules-arm64-nxp-ls1043ardb
-    summary: ONL Platform Configuration Package for the $LS1043
-
-    files:
-      src/lib/arm64-nxp-ls1043ardb-r0.yml: /lib/platform-config/$LS2088/onl/arm64-nxp-ls1043ardb-r0.yml
-      src/python/arm64_nxp_ls1043ardb_r0 : ${PY_INSTALL}/onl/platform/arm64_nxp_ls1043ardb_r0
-
-  - name: onl-platform-build-$LS1043
-    summary: ONL Platform Build Package for the $LS1043
-    optional-files:
-      builds: $$PKG_INSTALL
-
-  - name: onl-platform-config-$LS1046
-    depends: onl-vendor-config-nxp,onl-platform-modules-arm64-nxp-ls1046ardb
-    summary: ONL Platform Configuration Package for the $LS1046
-
-    files:
-      src/lib/arm64-nxp-ls1046ardb-r0.yml: /lib/platform-config/$LS1046/onl/arm64-nxp-ls1046ardb-r0.yml
-      src/python/arm64_nxp_ls1046ardb_r0 : ${PY_INSTALL}/onl/platform/arm64_nxp_ls1046ardb_r0
-
-  - name: onl-platform-build-$LS1046
-    summary: ONL Platform Build Package for the $LS1046
-    optional-files:
-      builds: $$PKG_INSTALL
-
-  - name: onl-platform-config-$LS1088
-    depends: onl-vendor-config-nxp,onl-platform-modules-arm64-nxp-ls1088ardb
-    summary: ONL Platform Configuration Package for the $LS1088
-
-    files:
-      src/lib/arm64-nxp-ls1088ardb-r0.yml: /lib/platform-config/$LS1088/onl/arm64-nxp-ls1088ardb-r0.yml
-      src/python/arm64_nxp_ls1088ardb_r0 : ${PY_INSTALL}/onl/platform/arm64_nxp_ls1088ardb_r0
-
-  - name: onl-platform-build-$LS1088
-    summary: ONL Platform Build Package for the $LS1088
-    optional-files:
-      builds: $$PKG_INSTALL
-
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/.gitignore b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/.gitignore
new file mode 100644
index 00000000..10f69609
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/.gitignore
@@ -0,0 +1,2 @@
+*arm64*nxp*ls2080ardb*.mk
+onlpdump.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/Makefile
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/modules/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/modules/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/modules/Makefile
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/modules/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/modules/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/modules/PKG.yml
new file mode 100644
index 00000000..37722e4c
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/modules/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/no-platform-modules.yml ARCH=arm64 VENDOR=nxp BASENAME=arm64-nxp-ls1043ardb
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/Makefile
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/PKG.yml
new file mode 100644
index 00000000..f284e514
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/onlp-platform-any.yml PLATFORM=arm64-nxp-ls1043ardb ARCH=arm64 TOOLCHAIN=aarch64-linux-gnu
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/Makefile
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/lib/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/lib/Makefile
similarity index 93%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/lib/Makefile
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/lib/Makefile
index 56f3afba..a3c1e116 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/lib/Makefile
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/lib/Makefile
@@ -23,7 +23,7 @@
 ############################################################
 include $(ONL)/make/config.arm64.mk
 
-MODULE := libonlp-arm64-nxp-layerscape
+MODULE := libonlp-arm64-nxp-ls1043ardb
 include $(BUILDER)/standardinit.mk
 
 DEPENDMODULES := AIM IOF arm64_nxp_layerscape onlplib
@@ -31,7 +31,7 @@ DEPENDMODULE_HEADERS := sff
 
 include $(BUILDER)/dependmodules.mk
 
-SHAREDLIB := libonlp-arm64-nxp-layerscape.so
+SHAREDLIB := libonlp-arm64-nxp-ls1043ardb.so
 $(SHAREDLIB)_TARGETS := $(ALL_TARGETS)
 include $(BUILDER)/so.mk
 .DEFAULT_GOAL := $(SHAREDLIB)
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1043ardb.mk b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1043ardb.mk
new file mode 100644
index 00000000..fb15033d
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1043ardb.mk
@@ -0,0 +1,10 @@
+
+###############################################################################
+#
+# Inclusive Makefile for the libonlp-arm64-nxp-ls1043ardb module.
+#
+# Autogenerated 2018-04-23 06:16:07.559855
+#
+###############################################################################
+libonlp-arm64-nxp-ls1043ardb_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/onlpdump/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/onlpdump/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/onlp/builds/onlpdump/Makefile
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/onlp/builds/onlpdump/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/Makefile
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/Makefile
similarity index 100%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/Makefile
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/Makefile
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/PKG.yml
new file mode 100644
index 00000000..31f09ba9
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/platform-config-platform.yml ARCH=arm64 VENDOR=nxp BASENAME=arm64-nxp-ls1043ardb REVISION=r0
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1043ardb-r0.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/src/lib/arm64-nxp-ls1043ardb-r0.yml
similarity index 93%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1043ardb-r0.yml
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/src/lib/arm64-nxp-ls1043ardb-r0.yml
index 307de935..430ba127 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1043ardb-r0.yml
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/src/lib/arm64-nxp-ls1043ardb-r0.yml
@@ -11,7 +11,7 @@ arm64-nxp-ls1043ardb-r0:
     kernel:
       <<: *arm64-kernel
     dtb:
-      =: fsl-ls1043a-rdb.dtb
+      =: fsl-ls1043a-rdb-sdk.dtb
       <<: *arm64-kernel-package
     itb:
       <<: *arm64-itb
@@ -23,7 +23,7 @@ arm64-nxp-ls1043ardb-r0:
     nos_bootcmds: *mmc_bootcmds
 
     environment:
-    - device: /dev/mtd3
+    - device: /dev/mtd2
       env_offset: 0x00000000
       env_size: 0x00020000
       sector_size: 0x00020000
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1043ardb_r0/__init__.py b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/src/python/arm64_nxp_ls1043ardb_r0/__init__.py
similarity index 93%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1043ardb_r0/__init__.py
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/src/python/arm64_nxp_ls1043ardb_r0/__init__.py
index 928a815f..ddfb4af7 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1043ardb_r0/__init__.py
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1043ardb/platform-config/r0/src/python/arm64_nxp_ls1043ardb_r0/__init__.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 from onl.platform.base import *
 from onl.platform.nxp import *
 
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/.gitignore b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/.gitignore
new file mode 100644
index 00000000..10f69609
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/.gitignore
@@ -0,0 +1,2 @@
+*arm64*nxp*ls2080ardb*.mk
+onlpdump.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/modules/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/modules/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/modules/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/modules/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/modules/PKG.yml
new file mode 100644
index 00000000..e1b76849
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/modules/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/no-platform-modules.yml ARCH=arm64 VENDOR=nxp BASENAME=arm64-nxp-ls1046ardb
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/PKG.yml
new file mode 100644
index 00000000..3c44d94f
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/onlp-platform-any.yml PLATFORM=arm64-nxp-ls1046ardb ARCH=arm64 TOOLCHAIN=aarch64-linux-gnu
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/Makefile
new file mode 100644
index 00000000..e7437cb2
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/Makefile
@@ -0,0 +1,2 @@
+FILTER=src
+include $(ONL)/make/subdirs.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/lib/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/lib/Makefile
new file mode 100644
index 00000000..4e50ff4f
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/lib/Makefile
@@ -0,0 +1,44 @@
+############################################################
+# <bsn.cl fy=2016 v=onl>
+#
+#           Copyright 2016 NXP Semiconductor, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+#
+#
+############################################################
+include $(ONL)/make/config.arm64.mk
+
+MODULE := libonlp-arm64-nxp-ls1046ardb
+include $(BUILDER)/standardinit.mk
+
+DEPENDMODULES := AIM IOF arm64_nxp_layerscape onlplib
+DEPENDMODULE_HEADERS := sff
+
+include $(BUILDER)/dependmodules.mk
+
+SHAREDLIB := libonlp-arm64-nxp-ls1046ardb.so
+$(SHAREDLIB)_TARGETS := $(ALL_TARGETS)
+include $(BUILDER)/so.mk
+.DEFAULT_GOAL := $(SHAREDLIB)
+
+GLOBAL_CFLAGS += -I$(onlp_BASEDIR)/module/inc
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MODULES_INIT=1
+GLOBAL_CFLAGS += -fPIC
+GLOBAL_LINK_LIBS += -lpthread
+
+include $(BUILDER)/targets.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1046ardb.mk b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1046ardb.mk
new file mode 100644
index 00000000..2c30dff9
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1046ardb.mk
@@ -0,0 +1,10 @@
+
+###############################################################################
+#
+# Inclusive Makefile for the libonlp-arm64-nxp-ls1046ardb module.
+#
+# Autogenerated 2018-04-23 11:35:14.871796
+#
+###############################################################################
+libonlp-arm64-nxp-ls1046ardb_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/onlpdump/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/onlpdump/Makefile
new file mode 100644
index 00000000..92193643
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/onlp/builds/onlpdump/Makefile
@@ -0,0 +1,45 @@
+############################################################
+# <bsn.cl fy=2016 v=onl>
+#
+#           Copyright 2016 NXP Semiconductor, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+#
+#
+#
+############################################################
+include $(ONL)/make/config.arm64.mk
+
+.DEFAULT_GOAL := onlpdump
+
+MODULE := onlpdump
+include $(BUILDER)/standardinit.mk
+
+DEPENDMODULES := AIM IOF onlp arm64_nxp_layerscape onlplib onlp_platform_defaults sff cjson cjson_util timer_wheel OS
+
+include $(BUILDER)/dependmodules.mk
+
+BINARY := onlpdump
+$(BINARY)_LIBRARIES := $(LIBRARY_TARGETS)
+include $(BUILDER)/bin.mk
+
+GLOBAL_CFLAGS += -DAIM_CONFIG_AIM_MAIN_FUNCTION=onlpdump_main
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MODULES_INIT=1
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MAIN=1
+GLOBAL_LINK_LIBS += -lpthread -lm
+
+include $(BUILDER)/targets.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/PKG.yml
new file mode 100644
index 00000000..ebb4a3a5
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/platform-config-platform.yml ARCH=arm64 VENDOR=nxp BASENAME=arm64-nxp-ls1046ardb REVISION=r0
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1046ardb-r0.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/src/lib/arm64-nxp-ls1046ardb-r0.yml
similarity index 92%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1046ardb-r0.yml
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/src/lib/arm64-nxp-ls1046ardb-r0.yml
index 3018fdeb..7759c978 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1046ardb-r0.yml
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/src/lib/arm64-nxp-ls1046ardb-r0.yml
@@ -11,7 +11,7 @@ arm64-nxp-ls1046ardb-r0:
     kernel:
       <<: *arm64-kernel
     dtb:
-      =: fsl-ls1046a-rdb.dtb
+      =: fsl-ls1046a-rdb-sdk.dtb
       <<: *arm64-kernel-package
     itb:
       <<: *arm64-itb
@@ -23,7 +23,7 @@ arm64-nxp-ls1046ardb-r0:
     nos_bootcmds: *mmc_bootcmds
 
     environment:
-    - device: /dev/mtd-uboot-env
+    - device: /dev/mtd2
       env_offset: 0x00000000
       env_size: 0x00020000
       sector_size: 0x00020000
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1046ardb_r0/__init__.py b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/src/python/arm64_nxp_ls1046ardb_r0/__init__.py
similarity index 93%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1046ardb_r0/__init__.py
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/src/python/arm64_nxp_ls1046ardb_r0/__init__.py
index 6be93cda..768802e4 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1046ardb_r0/__init__.py
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1046ardb/platform-config/r0/src/python/arm64_nxp_ls1046ardb_r0/__init__.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 from onl.platform.base import *
 from onl.platform.nxp import *
 
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/.gitignore b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/.gitignore
new file mode 100644
index 00000000..10f69609
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/.gitignore
@@ -0,0 +1,2 @@
+*arm64*nxp*ls2080ardb*.mk
+onlpdump.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/modules/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/modules/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/modules/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/modules/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/modules/PKG.yml
new file mode 100644
index 00000000..b4e3d3a5
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/modules/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/no-platform-modules.yml ARCH=arm64 VENDOR=nxp BASENAME=arm64-nxp-ls1088ardb
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/PKG.yml
new file mode 100644
index 00000000..0bafcdf7
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/onlp-platform-any.yml PLATFORM=arm64-nxp-ls1088ardb ARCH=arm64 TOOLCHAIN=aarch64-linux-gnu
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/Makefile
new file mode 100644
index 00000000..e7437cb2
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/Makefile
@@ -0,0 +1,2 @@
+FILTER=src
+include $(ONL)/make/subdirs.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/lib/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/lib/Makefile
new file mode 100644
index 00000000..cf0211ee
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/lib/Makefile
@@ -0,0 +1,44 @@
+############################################################
+# <bsn.cl fy=2016 v=onl>
+#
+#           Copyright 2016 NXP Semiconductor, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+#
+#
+############################################################
+include $(ONL)/make/config.arm64.mk
+
+MODULE := libonlp-arm64-nxp-ls1088ardb
+include $(BUILDER)/standardinit.mk
+
+DEPENDMODULES := AIM IOF arm64_nxp_layerscape onlplib
+DEPENDMODULE_HEADERS := sff
+
+include $(BUILDER)/dependmodules.mk
+
+SHAREDLIB := libonlp-arm64-nxp-ls1088ardb.so
+$(SHAREDLIB)_TARGETS := $(ALL_TARGETS)
+include $(BUILDER)/so.mk
+.DEFAULT_GOAL := $(SHAREDLIB)
+
+GLOBAL_CFLAGS += -I$(onlp_BASEDIR)/module/inc
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MODULES_INIT=1
+GLOBAL_CFLAGS += -fPIC
+GLOBAL_LINK_LIBS += -lpthread
+
+include $(BUILDER)/targets.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1088ardb.mk b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1088ardb.mk
new file mode 100644
index 00000000..c106670a
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/lib/libonlp-arm64-nxp-ls1088ardb.mk
@@ -0,0 +1,10 @@
+
+###############################################################################
+#
+# Inclusive Makefile for the libonlp-arm64-nxp-ls1088ardb module.
+#
+# Autogenerated 2018-04-23 11:35:09.987287
+#
+###############################################################################
+libonlp-arm64-nxp-ls1088ardb_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/onlpdump/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/onlpdump/Makefile
new file mode 100644
index 00000000..92193643
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/onlp/builds/onlpdump/Makefile
@@ -0,0 +1,45 @@
+############################################################
+# <bsn.cl fy=2016 v=onl>
+#
+#           Copyright 2016 NXP Semiconductor, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+#
+#
+#
+############################################################
+include $(ONL)/make/config.arm64.mk
+
+.DEFAULT_GOAL := onlpdump
+
+MODULE := onlpdump
+include $(BUILDER)/standardinit.mk
+
+DEPENDMODULES := AIM IOF onlp arm64_nxp_layerscape onlplib onlp_platform_defaults sff cjson cjson_util timer_wheel OS
+
+include $(BUILDER)/dependmodules.mk
+
+BINARY := onlpdump
+$(BINARY)_LIBRARIES := $(LIBRARY_TARGETS)
+include $(BUILDER)/bin.mk
+
+GLOBAL_CFLAGS += -DAIM_CONFIG_AIM_MAIN_FUNCTION=onlpdump_main
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MODULES_INIT=1
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MAIN=1
+GLOBAL_LINK_LIBS += -lpthread -lm
+
+include $(BUILDER)/targets.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/PKG.yml
new file mode 100644
index 00000000..0519b1bd
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/platform-config-platform.yml ARCH=arm64 VENDOR=nxp BASENAME=arm64-nxp-ls1088ardb REVISION=r0
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1088ardb-r0.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/src/lib/arm64-nxp-ls1088ardb-r0.yml
similarity index 78%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1088ardb-r0.yml
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/src/lib/arm64-nxp-ls1088ardb-r0.yml
index 1bc02414..bb979181 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls1088ardb-r0.yml
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/src/lib/arm64-nxp-ls1088ardb-r0.yml
@@ -2,7 +2,7 @@
 
 ######################################################################
 #
-# platform-config for LS2088ARDB
+# platform-config for LS1088ARDB
 #
 ######################################################################
 
@@ -11,21 +11,21 @@ arm64-nxp-ls1088ardb-r0:
     kernel:
       <<: *arm64-kernel
     dtb:
-      =: fsl-ls1088a-rdb.dtb
+      =: fsl-ls1043a-rdb-sdk.dtb
       <<: *arm64-kernel-package
     itb:
       <<: *arm64-itb
 
   loader:
     device: /dev/mmcblk0
-    ##partition: /dev/sda1
+    ##partition: /dev/mmcblk0p1
     loadaddr: 0xa0000000
-    nos_bootcmds: *usb_bootcmds
+    nos_bootcmds: *mmc_bootcmds
 
     environment:
-    - device: /dev/mtd-uboot-env
+    - device: /dev/mtd2
       env_offset: 0x00000000
-      env_size: 0x0002000
+      env_size: 0x00020000
       sector_size: 0x00020000
 
   installer:
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1088ardb_r0/__init__.py b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/src/python/arm64_nxp_ls1088ardb_r0/__init__.py
similarity index 86%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1088ardb_r0/__init__.py
rename to packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/src/python/arm64_nxp_ls1088ardb_r0/__init__.py
index e2dd8842..ab44a1b7 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls1088ardb_r0/__init__.py
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls1088ardb/platform-config/r0/src/python/arm64_nxp_ls1088ardb_r0/__init__.py
@@ -1,8 +1,10 @@
+#!/usr/bin/python
+
 from onl.platform.base import *
 from onl.platform.nxp import *
 
 class OnlPlatform_arm64_nxp_ls1088ardb_r0(OnlPlatformNxp,
                                           OnlPlatformPortConfig_8x1_8x10):
     PLATFORM='arm64-nxp-ls1088ardb-r0'
-    MODEL="LS188ARDB"
+    MODEL="LS1088ARDB"
     SYS_OBJECT_ID=".1088"
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/.gitignore b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/.gitignore
new file mode 100644
index 00000000..10f69609
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/.gitignore
@@ -0,0 +1,2 @@
+*arm64*nxp*ls2080ardb*.mk
+onlpdump.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/modules/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/modules/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/modules/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/modules/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/modules/PKG.yml
new file mode 100644
index 00000000..80f09b76
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/modules/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/no-platform-modules.yml ARCH=arm64 VENDOR=nxp BASENAME=arm64-nxp-ls2088ardb
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/PKG.yml
new file mode 100644
index 00000000..21351f7a
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/onlp-platform-any.yml PLATFORM=arm64-nxp-ls2088ardb ARCH=arm64 TOOLCHAIN=aarch64-linux-gnu
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/Makefile
new file mode 100644
index 00000000..e7437cb2
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/Makefile
@@ -0,0 +1,2 @@
+FILTER=src
+include $(ONL)/make/subdirs.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/lib/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/lib/Makefile
new file mode 100644
index 00000000..7f88cbee
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/lib/Makefile
@@ -0,0 +1,44 @@
+############################################################
+# <bsn.cl fy=2016 v=onl>
+#
+#           Copyright 2016 NXP Semiconductor, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+#
+#
+############################################################
+include $(ONL)/make/config.arm64.mk
+
+MODULE := libonlp-arm64-nxp-ls2088ardb
+include $(BUILDER)/standardinit.mk
+
+DEPENDMODULES := AIM IOF arm64_nxp_layerscape onlplib
+DEPENDMODULE_HEADERS := sff
+
+include $(BUILDER)/dependmodules.mk
+
+SHAREDLIB := libonlp-arm64-nxp-ls2088ardb.so
+$(SHAREDLIB)_TARGETS := $(ALL_TARGETS)
+include $(BUILDER)/so.mk
+.DEFAULT_GOAL := $(SHAREDLIB)
+
+GLOBAL_CFLAGS += -I$(onlp_BASEDIR)/module/inc
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MODULES_INIT=1
+GLOBAL_CFLAGS += -fPIC
+GLOBAL_LINK_LIBS += -lpthread
+
+include $(BUILDER)/targets.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/lib/libonlp-arm64-nxp-ls2088ardb.mk b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/lib/libonlp-arm64-nxp-ls2088ardb.mk
new file mode 100644
index 00000000..5c430d7d
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/lib/libonlp-arm64-nxp-ls2088ardb.mk
@@ -0,0 +1,10 @@
+
+###############################################################################
+#
+# Inclusive Makefile for the libonlp-arm64-nxp-ls2088ardb module.
+#
+# Autogenerated 2018-04-23 11:35:06.218209
+#
+###############################################################################
+libonlp-arm64-nxp-ls2088ardb_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/onlpdump/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/onlpdump/Makefile
new file mode 100644
index 00000000..92193643
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/onlp/builds/onlpdump/Makefile
@@ -0,0 +1,45 @@
+############################################################
+# <bsn.cl fy=2016 v=onl>
+#
+#           Copyright 2016 NXP Semiconductor, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+#
+#
+#
+############################################################
+include $(ONL)/make/config.arm64.mk
+
+.DEFAULT_GOAL := onlpdump
+
+MODULE := onlpdump
+include $(BUILDER)/standardinit.mk
+
+DEPENDMODULES := AIM IOF onlp arm64_nxp_layerscape onlplib onlp_platform_defaults sff cjson cjson_util timer_wheel OS
+
+include $(BUILDER)/dependmodules.mk
+
+BINARY := onlpdump
+$(BINARY)_LIBRARIES := $(LIBRARY_TARGETS)
+include $(BUILDER)/bin.mk
+
+GLOBAL_CFLAGS += -DAIM_CONFIG_AIM_MAIN_FUNCTION=onlpdump_main
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MODULES_INIT=1
+GLOBAL_CFLAGS += -DAIM_CONFIG_INCLUDE_MAIN=1
+GLOBAL_LINK_LIBS += -lpthread -lm
+
+include $(BUILDER)/targets.mk
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/Makefile b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/PKG.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/PKG.yml
new file mode 100644
index 00000000..91c1f091
--- /dev/null
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/PKG.yml
@@ -0,0 +1 @@
+!include $ONL_TEMPLATES/platform-config-platform.yml ARCH=arm64 VENDOR=nxp BASENAME=arm64-nxp-ls2088ardb REVISION=r0
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls2088ardb-r0.yml b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/src/lib/arm64-nxp-ls2088ardb-r0.yml
similarity index 93%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls2088ardb-r0.yml
rename to packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/src/lib/arm64-nxp-ls2088ardb-r0.yml
index ac57196e..602b588c 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/lib/arm64-nxp-ls2088ardb-r0.yml
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/src/lib/arm64-nxp-ls2088ardb-r0.yml
@@ -17,7 +17,7 @@ arm64-nxp-ls2088ardb-r0:
       <<: *arm64-itb
 
   loader:
-    device: /dev/mmcblk0
+    device: /dev/sda
     ##partition: /dev/sda1
     loadaddr: 0xa0000000
     nos_bootcmds: *usb_bootcmds
@@ -25,7 +25,7 @@ arm64-nxp-ls2088ardb-r0:
     environment:
     - device: /dev/mtd2
       env_offset: 0x00000000
-      env_size: 0x0002000
+      env_size: 0x00020000
       sector_size: 0x00020000
 
   installer:
diff --git a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls2088ardb_r0/__init__.py b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/src/python/arm64_nxp_ls2088ardb_r0/__init__.py
similarity index 93%
rename from packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls2088ardb_r0/__init__.py
rename to packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/src/python/arm64_nxp_ls2088ardb_r0/__init__.py
index 9942a1a4..6691d026 100644
--- a/packages/platforms/nxp/arm64/arm64-nxp-layerscape/platform-config/r0/src/python/arm64_nxp_ls2088ardb_r0/__init__.py
+++ b/packages/platforms/nxp/arm64/arm64-nxp-ls2088ardb/platform-config/r0/src/python/arm64_nxp_ls2088ardb_r0/__init__.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 from onl.platform.base import *
 from onl.platform.nxp import *
 
diff --git a/tools/flat-image-tree.py b/tools/flat-image-tree.py
index 74c330e9..19ad7f9c 100755
--- a/tools/flat-image-tree.py
+++ b/tools/flat-image-tree.py
@@ -134,8 +134,11 @@ class InitrdImage(Image):
 class DtbImage(Image):
     """DTB Image Entry"""
 
-    def __init__(self, fdata):
+    def __init__(self, fdata, arch):
         Image.__init__(self, "flat_dt", fdata, compression="none")
+	if arch == 'arm64':
+		self.load = "<0x90000000>"
+		self.entry ="<0x90000000>"
 
     def write(self, f):
         self.start_image(f)
@@ -240,7 +243,7 @@ class FlatImageTree(object):
 
         ddict = {}
         for d in self.dtbs:
-            di = DtbImage(d)
+            di = DtbImage(d, ops.arch)
             ddict[di.name] = di
 
         idict = {}
@@ -281,7 +284,7 @@ class FlatImageTree(object):
             f.write("""            description = "%s";\n""" % name)
             f.write("""            kernel = "%s";\n""" % (KernelImage(kernel, ops.arch).name))
             f.write("""            ramdisk = "%s";\n""" % (InitrdImage(initrd, ops.arch).name))
-            f.write("""            fdt = "%s";\n""" % (DtbImage(dtb).name))
+            f.write("""            fdt = "%s";\n""" % (DtbImage(dtb, ops.arch).name))
             f.write("""        };\n\n""")
         f.write("""    };\n""")
         f.write("""};\n""")