From 59b075223a6852cbfbf04cee131c2830dd9fd335 Mon Sep 17 00:00:00 2001
From: Waldemar Tomme <waldetomme@gmail.com>
Date: Tue, 4 Apr 2023 19:03:51 +0200
Subject: [PATCH] Cleanup and smol redo

---
 AndroidBoard.mk |  8 -------
 BoardConfig.mk  | 63 +++++++++++++++++++++++++++++--------------------
 device.mk       | 27 ++++++++++++++-------
 kernel          |  0
 recovery.fstab  | 10 --------
 5 files changed, 56 insertions(+), 52 deletions(-)
 delete mode 100644 AndroidBoard.mk
 delete mode 100644 kernel
 delete mode 100644 recovery.fstab

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
deleted file mode 100644
index bca2c08..0000000
--- a/AndroidBoard.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET)
-
-# include the non-open-source counterpart to this file
--include vendor/samsung/a7y18lte/AndroidBoardVendor.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b339a2f..0f40750 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,34 +1,47 @@
-USE_CAMERA_STUB := true
+# USE_CAMERA_STUB := true
 
-# inherit from the proprietary version
--include vendor/samsung/a7y18lte/BoardConfigVendor.mk
+# # inherit from the proprietary version
+# -include vendor/samsung/a7y18lte/BoardConfigVendor.mk
 
-TARGET_ARCH := arm64
-TARGET_NO_BOOTLOADER := true
-TARGET_BOARD_PLATFORM := exynos7
-TARGET_SOC := exynos7885
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 := 
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_VARIANT := cortex-a7
-TARGET_CPU_SMP := true
-ARCH_ARM_HAVE_TLS_REGISTER := true
+# TARGET_ARCH := arm64
+# TARGET_NO_BOOTLOADER := true
+# TARGET_BOARD_PLATFORM := exynos7
+# TARGET_SOC := exynos7885
+# TARGET_CPU_ABI := arm64-v8a
+# TARGET_CPU_ABI2 := 
+# TARGET_ARCH_VARIANT := armv8-a
+# TARGET_CPU_VARIANT := cortex-a73
+# TARGET_CPU_SMP := true
+# ARCH_ARM_HAVE_TLS_REGISTER := true
 
-TARGET_BOOTLOADER_BOARD_NAME := a7y18lte
+# TARGET_BOOTLOADER_BOARD_NAME := a7y18lte
 
-BOARD_KERNEL_CMDLINE := no_console_suspend
-BOARD_KERNEL_BASE := 0x10000000
-BOARD_KERNEL_PAGESIZE := 00000800
-BOARD_KERNEL_IMAGE_NAME := zImage
+# BOARD_KERNEL_CMDLINE := no_console_suspend
+# BOARD_KERNEL_BASE := 0x10000000
+# BOARD_KERNEL_PAGESIZE := 00000800
+# BOARD_KERNEL_IMAGE_NAME := zImage
 
 # fix this up by examining /proc/mtd on a running device
-BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00380000
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00480000
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x08c60000
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x105c0000
-BOARD_FLASH_BLOCK_SIZE := 131072
+# BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00380000
+# BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00480000
+# BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x08c60000
+# BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x105c0000
+# BOARD_FLASH_BLOCK_SIZE := 2048
 
+# BOARD_HAS_NO_SELECT_BUTTON := true
+
+#---------------------
+
+# CPU
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+
+# Kernel
+TARGET_KERNEL_ARCH := arm64
+TARGET_KERNEL_HEADER_ARCH := arm64
+TARGET_LINUX_KERNEL_VERSION := 4.4
+
+# Kernel config
 TARGET_KERNEL_SOURCE := kernel/samsung/a7y18lte
 TARGET_KERNEL_CONFIG := exynos7885-a7y18lte_defconfig
-
-BOARD_HAS_NO_SELECT_BUTTON := true
diff --git a/device.mk b/device.mk
index 00ce9a9..79405aa 100644
--- a/device.mk
+++ b/device.mk
@@ -1,14 +1,23 @@
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
+# $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
-# The gps config appropriate for this device
-$(call inherit-product, device/common/gps/gps_us_supl.mk)
+# # The gps config appropriate for this device
+# $(call inherit-product, device/common/gps/gps_us_supl.mk)
 
-$(call inherit-product-if-exists, vendor/samsung/a7y18lte/a7y18lte-vendor.mk)
+# $(call inherit-product-if-exists, vendor/samsung/a7y18lte/a7y18lte-vendor.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/samsung/a7y18lte/overlay
+# DEVICE_PACKAGE_OVERLAYS += device/samsung/a7y18lte/overlay
 
-$(call inherit-product, build/target/product/full.mk)
+# $(call inherit-product, build/target/product/full.mk)
 
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
-PRODUCT_NAME := full_a7y18lte
-PRODUCT_DEVICE := a7y18lte
+# PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
+# PRODUCT_NAME := full_a7y18lte
+# PRODUCT_DEVICE := a7y18lte
+
+#------------------------------
+
+# System.prop
+TARGET_SYSTEM_PROP += device/samsung/a7y17lte/system.prop
+
+# Flat device tree for boot image
+PRODUCT_HOST_PACKAGES += \
+    dtbhtoolExynos
diff --git a/kernel b/kernel
deleted file mode 100644
index e69de29..0000000
diff --git a/recovery.fstab b/recovery.fstab
deleted file mode 100644
index 41fb92e..0000000
--- a/recovery.fstab
+++ /dev/null
@@ -1,10 +0,0 @@
-# mount point	fstype    device    	[device2]
-
-/boot       mtd         boot
-/cache      yaffs2      cache
-/data       yaffs2      userdata
-/misc       mtd         misc
-/recovery   mtd         recovery
-/sdcard     vfat        /dev/block/mmcblk0p1        /dev/block/mmcblk0
-/system     yaffs2      system
-/sd-ext     ext4        /dev/block/mmcblk0p2