Browse Source

support beagle from git patch '-m ffd966989a9fd59ccb5f9b5d76780bc25fde8b46 c804b742840303a0b46a0c14d17e8ff01ec973cc'

Huan.Feng 3 years ago
parent
commit
c6cc771359
3 changed files with 500 additions and 386 deletions
  1. 448 334
      board/starfive/vic7100/vic7100.c
  2. 18 18
      drivers/serial/serial_starfive.c
  3. 34 34
      include/configs/starfive-vic7100.h

File diff suppressed because it is too large
+ 448 - 334
board/starfive/vic7100/vic7100.c


+ 18 - 18
drivers/serial/serial_starfive.c

@@ -137,10 +137,10 @@ DECLARE_GLOBAL_DATA_PTR;
 
 //#define DW_UART_BASE_ADDR	 SIFIVE_UART_BASE_ADDR
 
-static u32 starfive_uart_read(u32 reg)
-{
-	return readl(SIFIVE_UART_BASE_ADDR + reg);
-}
+	static u32 starfive_uart_read(u32 reg)
+	{
+		return readl(SIFIVE_UART_BASE_ADDR + reg);
+	}
 
 static void starfive_uart_write(u32 ch,u32 reg)
 {
@@ -173,8 +173,8 @@ static void starfive_uart_setbrg(void)
 {
 	u64 baud_value;
 	/*
-	* BAUD_VALUE = (CLOCK / BAUD_RATE) - 1
-	*/
+	 * BAUD_VALUE = (CLOCK / BAUD_RATE) - 1
+	 */
 	baud_value = ((SIFIVE_PERIPH_CLK_FREQ / CONFIG_BAUDRATE)>>4);
 
 	starfive_uart_write(((baud_value>>0)&0xFF),SER_DLL);
@@ -206,7 +206,7 @@ static int starfive_uart_init(void)
 	vic_uart0_reset_clk_gpio_evb_enable;
 	vic_uart1_reset_clk_gpio_evb_enable;
 	//vic_uart2_reset_clk_gpio_evb_enable;
-	vic_uart3_reset_clk_gpio_evb_enable;
+	//vic_uart3_reset_clk_gpio_evb_enable;
 
 	if(databits >=5 && databits <=8) {
 		datab = (databits - 5);
@@ -234,8 +234,8 @@ static int starfive_uart_init(void)
 
 	//enable fifo and reset fifo, 1-byte int trig!
 	starfive_uart_write((RCVR_TRIG_1C|TXEM_TRIG_EMT|
-						 TXFIFO_RST|RXFIFO_RST|FIFO_ENA),
-						SER_FCR);
+			     TXFIFO_RST|RXFIFO_RST|FIFO_ENA),
+			    SER_FCR);
 
 	starfive_uart_write(mcr,SER_MCR);
 
@@ -252,15 +252,15 @@ static int starfive_uart_tstc(void)
 }
 
 static struct serial_device starfive_uart_drv = {
-	.name = "starfive_uart",
-	.start = starfive_uart_init,
-	.stop = NULL,
-	.setbrg = starfive_uart_setbrg,
-	.putc = starfive_uart_putc,
-	.puts = starfive_uart_puts,
-	.getc = starfive_uart_getc,
-	.tstc = starfive_uart_tstc,
-};
+	 .name = "starfive_uart",
+	 .start = starfive_uart_init,
+	 .stop = NULL,
+	 .setbrg = starfive_uart_setbrg,
+	 .putc = starfive_uart_putc,
+	 .puts = starfive_uart_puts,
+	 .getc = starfive_uart_getc,
+	 .tstc = starfive_uart_tstc,
+	};
 
 void starfive_uart_initialize(void)
 {

+ 34 - 34
include/configs/starfive-vic7100.h

@@ -17,11 +17,11 @@
 #define CONFIG_SPL_MAX_SIZE		0x00100000
 #define CONFIG_SPL_BSS_START_ADDR	0x85000000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x00100000
-#define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SPL_BSS_START_ADDR + \
+#define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SPL_BSS_START_ADDR +	\
 					 CONFIG_SPL_BSS_MAX_SIZE)
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00100000
 
-#define CONFIG_SPL_STACK	(0x08000000 + 0x001D0000 - \
+#define CONFIG_SPL_STACK	(0x08000000 + 0x001D0000 -	\
 				 GENERATED_GBL_DATA_SIZE)
 
 #endif
@@ -50,7 +50,7 @@
 /*
  * Print Buffer Size
  */
-#define CONFIG_SYS_PBSIZE	\
+#define CONFIG_SYS_PBSIZE					\
 	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /*
@@ -130,7 +130,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_DW_ALTDESCRIPTOR
-#define CONFIG_PHY_ADDR		0
+#define CONFIG_PHY_ADDR		7
 #define CONFIG_ARP_TIMEOUT	0x5000
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_IPADDR		192.168.120.200
@@ -144,8 +144,8 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* HACK these should have '#if defined (stuff) around them like zynqp*/
-#define BOOT_TARGET_DEVICES(func) func(DHCP, dhcp, na) \
-				func(MMC, mmc, 0)
+#define BOOT_TARGET_DEVICES(func) func(DHCP, dhcp, na)	\
+		func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
 
@@ -161,15 +161,15 @@
 #define SIFIVE_FDT_BASE		0x86000000
 #define KERNEL_LOAD_BASE		0x80700000
 
-#define	CONFIG_EXTRA_ENV_SETTINGS	\
-		"ip_dyn=yes\0" \
-		"uboot_version=" __stringify(PLAIN_VERSION) "\0" \
-		"mmcsetup=mmc part\0" \
-		"fdt_high=0xffffffffffffffff\0" \
-		"fdtsetup=fdt addr ${fdtcontroladdr}\0" \
-		"fatenv=setenv fileaddr a0000000; fatload mmc 0:1 ${fileaddr} u74_uEnv.txt;" \
-			"env import -t ${fileaddr} ${filesize}\0"		\
-		BOOTENV
+#define	CONFIG_EXTRA_ENV_SETTINGS					\
+	"ip_dyn=yes\0"							\
+	"uboot_version=" __stringify(PLAIN_VERSION) "\0"		\
+	"mmcsetup=mmc part\0"						\
+	"fdt_high=0xffffffffffffffff\0"					\
+	"fdtsetup=fdt addr ${fdtcontroladdr}\0"				\
+	"fatenv=setenv fileaddr a0000000; fatload mmc 0:1 ${fileaddr} u74_uEnv.txt;" \
+	"env import -t ${fileaddr} ${filesize}\0"			\
+	BOOTENV
 #endif
 
 #include <environment/distro/sf.h>
@@ -178,30 +178,30 @@
 #define TYPE_GUID_LOADER2	"2E54B353-1271-4842-806F-E436D6AF6985"
 #define TYPE_GUID_SYSTEM	"0FC63DAF-8483-4772-8E79-3D69D8477DE4"
 
-#define PARTS_DEFAULT \
+#define PARTS_DEFAULT							\
 	"name=loader1,start=17K,size=1M,type=${type_guid_gpt_loader1};" \
-	"name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \
+	"name=loader2,size=4MB,type=${type_guid_gpt_loader2};"		\
 	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"fdt_high=0xffffffffffffffff\0" \
-	"initrd_high=0xffffffffffffffff\0" \
-	"kernel_addr_r=0x84000000\0" \
-	"fdt_addr_r=0x88000000\0" \
-	"scriptaddr=0x88100000\0" \
-	"script_offset_f=0x1fff000\0" \
-	"script_size_f=0x1000\0" \
-	"pxefile_addr_r=0x88200000\0" \
-	"ramdisk_addr_r=0x88300000\0" \
+#define CONFIG_EXTRA_ENV_SETTINGS			\
+	"fdt_high=0xffffffffffffffff\0"			\
+	"initrd_high=0xffffffffffffffff\0"		\
+	"kernel_addr_r=0x84000000\0"			\
+	"fdt_addr_r=0x88000000\0"			\
+	"scriptaddr=0x88100000\0"			\
+	"script_offset_f=0x1fff000\0"			\
+	"script_size_f=0x1000\0"			\
+	"pxefile_addr_r=0x88200000\0"			\
+	"ramdisk_addr_r=0x88300000\0"			\
 	"type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
-	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
-	"partitions=" PARTS_DEFAULT "\0" \
-	BOOTENV \
+	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0"	\
+	"partitions=" PARTS_DEFAULT "\0"		\
+	BOOTENV						\
 	BOOTENV_SF
 
-#define CONFIG_PREBOOT \
-	"setenv fdt_addr ${fdtcontroladdr};" \
+#define CONFIG_PREBOOT				\
+	"setenv fdt_addr ${fdtcontroladdr};"	\
 	"fdt addr ${fdtcontroladdr};"
 
 
@@ -221,8 +221,8 @@
 
 
 /*
-+ * QSPI support
-+ */
+  + * QSPI support
+  + */
 #ifdef CONFIG_OF_CONTROL		/* QSPI is controlled via DT */
 #define CONFIG_CQSPI_REF_CLK		(250000000)
 #endif

Some files were not shown because too many files changed in this diff