Compile mp13x (WIP)

Author: danngreen

Makefile

@@ -9,15 +9,18 @@ EXTLIBDIR = third-party
 
 ifeq ($(SERIES),stm32mp13x)
 LINKSCR := linkscript-mp13x.ld
+SERIESDIR := ${SRCDIR}/drivers/mp13x
+HALDIR := $(EXTLIBDIR)/STM32MP13x_HAL_Driver
 else
 LINKSCR := linkscript.ld
+SERIESDIR := ${SRCDIR}/drivers/mp15x
+HALDIR := $(EXTLIBDIR)/STM32MP1xx_HAL_Driver
 endif
 
 SD_DISK_STEM ?= /dev/disk4s
 
 SOURCES = $(SRCDIR)/startup.s \
 		  $(SRCDIR)/main.cc \
-		  $(SRCDIR)/systeminit.c \
 		  $(SRCDIR)/libc_stub.c \
 		  $(SRCDIR)/libcpp_stub.cc \
 		  $(SRCDIR)/print.cc \
@@ -26,7 +29,13 @@ SOURCES = $(SRCDIR)/startup.s \
 		  $(SRCDIR)/uboot-port/lib/crc32.c \
 		  $(SRCDIR)/drivers/norflash/qspi_ll.c \
 		  $(SRCDIR)/drivers/norflash/qspi_norflash_read.c \
-		  $(SRCDIR)/gpt/gpt.cc 
+		  $(SRCDIR)/gpt/gpt.cc \
+		  $(SERIESDIR)/systeminit.c \
+		  $(HALDIR)/Src/stm32mp1xx_ll_usart.c \
+		  $(HALDIR)/Src/stm32mp1xx_ll_rcc.c \
+		  $(HALDIR)/Src/stm32mp1xx_hal.c \
+		  $(HALDIR)/Src/stm32mp1xx_ll_sdmmc.c \
+		  $(HALDIR)/Src/stm32mp1xx_hal_sd.c \
 
 
 INCLUDES = -I. \
@@ -35,48 +44,29 @@ INCLUDES = -I. \
 		   -I$(EXTLIBDIR)/CMSIS/Core_A/Include \
 		   -I$(SRCDIR)/uboot-port/include \
 		   -I$(SRCDIR)/uboot-port/arch/arm/include \
+		   -I$(SERIESDIR) \
+		   -I$(HALDIR)/Inc \
+		   -I$(EXTLIBDIR)/CMSIS/Device/ST/STM32MP1xx/Include
 
 ifeq ($(SERIES),stm32mp13x)
-SOURCES += \
-		  $(EXTLIBDIR)/STM32MP13xx_HAL_Driver/Src/stm32mp13xx_ll_usart.c \
-		  $(EXTLIBDIR)/STM32MP13xx_HAL_Driver/Src/stm32mp13xx_ll_rcc.c \
-		  $(EXTLIBDIR)/STM32MP13xx_HAL_Driver/Src/stm32mp13xx_hal.c \
-		  $(EXTLIBDIR)/STM32MP13xx_HAL_Driver/Src/stm32mp13xx_ll_sdmmc.c \
-		  $(EXTLIBDIR)/STM32MP13xx_HAL_Driver/Src/stm32mp13xx_hal_sd.c \
-		  $(EXTLIBDIR)/STM32MP13xx_HAL_Driver/Src/stm32mp13xx_hal_ddr.c
-
-INCLUDES += \
-		   -I$(EXTLIBDIR)/STM32MP13xx_HAL_Driver/Inc \
-		   -I$(EXTLIBDIR)/CMSIS/Device/ST/STM32MP1xx/Include \
-		   -I$(SRCDIR)/drivers/mp13x/ 
+	SOURCES += $(HALDIR)/Src/stm32mp13xx_hal_ddr.c
+
 else
-SOURCES += \
-		  $(EXTLIBDIR)/STM32MP1xx_HAL_Driver/Src/stm32mp1xx_ll_usart.c \
-		  $(EXTLIBDIR)/STM32MP1xx_HAL_Driver/Src/stm32mp1xx_ll_rcc.c \
-		  $(EXTLIBDIR)/STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal.c \
-		  $(EXTLIBDIR)/STM32MP1xx_HAL_Driver/Src/stm32mp1xx_ll_sdmmc.c \
-		  $(EXTLIBDIR)/STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_sd.c \
-		  $(SRCDIR)/drivers/mp15x/drivers/ddr/stm32mp1_ddr.cc \
-		  $(SRCDIR)/drivers/mp15x/drivers/ddr/stm32mp1_ram.cc
-
-INCLUDES += \
-		   -I$(EXTLIBDIR)/STM32MP1xx_HAL_Driver/Inc \
-		   -I$(EXTLIBDIR)/CMSIS/Device/ST/STM32MP1xx/Include \
-		   -I$(SRCDIR)/drivers/mp15x/ 
+	SOURCES += $(SRCDIR)/drivers/mp15x/drivers/ddr/stm32mp1_ddr.cc \
+			   $(SRCDIR)/drivers/mp15x/drivers/ddr/stm32mp1_ram.cc
 endif
 
 
 MCU = -mcpu=cortex-a7 -march=armv7ve -mfpu=neon-vfpv4 -mlittle-endian -mfloat-abi=hard
 
 
 ARCH_CFLAGS = -DUSE_FULL_LL_DRIVER \
-			  -DSTM32MP1 \
 			  -DCORE_CA7
 
 ifeq ($(SERIES),stm32mp13x)
-	ARCH_CFLAGS += -DSTM32MP135Dxx 
+	ARCH_CFLAGS += -DSTM32MP135Dxx -DSTM32MP13
 else
-	ARCH_CFLAGS += -DSTM32MP157Cxx
+	ARCH_CFLAGS += -DSTM32MP157Cxx -DSTM32MP1
 endif
 
 ifeq ("$(BOARD_CONF)","OSD32")

src/drivers/i2c.hh

@@ -2,7 +2,7 @@
 #include "drivers/i2c_conf.hh"
 #include "drivers/pinconf.hh"
 #include "drivers/rcc.hh"
-#include "stm32mp1xx.h"
+#include "drivers/stm32mpxxx.h"
 #include <optional>
 #include <span>
 
@@ -131,10 +131,7 @@ public:
 		return true;
 	}
 
-	bool is_init()
-	{
-		return _is_init;
-	}
+	bool is_init() { return _is_init; }
 
 private:
 	// Writes the register address, without generating a stop

src/drivers/leds.hh

@@ -1,7 +1,6 @@
 #pragma once
+#include "drivers/stm32mpxxx.h"
 #include "pinconf.hh"
-#include "stm32mp1xx.h"
-#include "stm32mp1xx_ll_gpio.h"
 
 enum class LedActive { Low, High };
 
@@ -19,10 +18,7 @@ public:
 	constexpr static uint16_t pin_mask = static_cast<uint16_t>(PINMASK);
 	constexpr static uint32_t pin_num = PinConf::bit_to_num(PINMASK);
 
-	Led()
-	{
-		PinConf{GPIOx, PINMASK, PinAF::AFNone}.init(PinMode::Output);
-	}
+	Led() { PinConf{GPIOx, PINMASK, PinAF::AFNone}.init(PinMode::Output); }
 
 	void on()
 	{

src/drivers/mp13x/drivers/rcc.hh

@@ -1,7 +1,7 @@
 #pragma once
 // #include "drivers/rcc_common.hh"
 #include "drivers/register_access.hh"
-#include "stm32mp1xx.h"
+#include "drivers/stm32mpxxx.h"
 #include <cstddef>
 #include <variant>