From d39530c29cacf68ab672e265b22e072ba86f443c Mon Sep 17 00:00:00 2001
From: Benjamin Krill <ben@codiert.org>
Date: Mon, 31 Mar 2014 11:25:59 +0200
Subject: [PATCH] sdcard prepare for 4GB cards. Minor clean-ups.

---
 fpga/soc/soc_system.qsys           |  8 ++---
 fpga/soc/soc_system_board_info.xml |  4 +--
 fpga/syn/Makefile                  | 50 +++++++++++++++---------------
 fpga/syn/sockit.qsf_tmpl           |  1 -
 fpga/top/sockit.vhd                |  3 --
 5 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/fpga/soc/soc_system.qsys b/fpga/soc/soc_system.qsys
index 42be191..1b02c0f 100644
--- a/fpga/soc/soc_system.qsys
+++ b/fpga/soc/soc_system.qsys
@@ -134,7 +134,7 @@
          type = "int";
       }
    }
-   element button_pio.s1
+   element led_pio.s1
    {
       datum _lockedAddress
       {
@@ -143,7 +143,7 @@
       }
       datum baseAddress
       {
-         value = "65728";
+         value = "65600";
          type = "String";
       }
    }
@@ -160,7 +160,7 @@
          type = "String";
       }
    }
-   element led_pio.s1
+   element button_pio.s1
    {
       datum _lockedAddress
       {
@@ -169,7 +169,7 @@
       }
       datum baseAddress
       {
-         value = "65600";
+         value = "65728";
          type = "String";
       }
    }
diff --git a/fpga/soc/soc_system_board_info.xml b/fpga/soc/soc_system_board_info.xml
index 8037af9..873f7de 100644
--- a/fpga/soc/soc_system_board_info.xml
+++ b/fpga/soc/soc_system_board_info.xml
@@ -222,9 +222,7 @@ mac-address field in device tree blob -->
 <val type="hex">0x100</val>
 </DTAppend>
 
-
-
 <Chosen>
-        <Bootargs val="console=ttyS0,57600"></Bootargs>
+        <Bootargs val="console=ttyS0,115200"></Bootargs>
 </Chosen>
 </BoardInfo>
diff --git a/fpga/syn/Makefile b/fpga/syn/Makefile
index 8073112..f7f564d 100644
--- a/fpga/syn/Makefile
+++ b/fpga/syn/Makefile
@@ -73,8 +73,6 @@ $(PRELOADER_DIR)/Makefile: $(PRELOADER_ID)
 			--preloader-settings-dir "$(PRELOADER_HANDOFF)" \
 			--settings settings.bsp \
 			--set spl.boot.WATCHDOG_ENABLE false
-	@echo "PATCH MAKEFILE"
-	sed -i 's/mkpimage -o \$$\@ \$$< \$$< \$$< \$$</mkpimage -o \$$@ \$$</' $(PRELOADER_DIR)/Makefile
 
 preloader: $(PRELOADER_DIR)/Makefile
 	make -C $(PRELOADER_DIR)
@@ -172,39 +170,41 @@ ifeq ($(origin SD_PRELOADER), command line)
 	SD_DEPENDENCY += sd_preloader
 endif
 
-sd_rootfs: $(SD_DEV)2 $(ROOTFS)
-	sudo mount $(SD_DEV)2 /mnt
-	sudo tar --strip-components 1 -xf $(ROOTFS) -C /mnt
+PART_EXT=p
+
+sd_rootfs: $(SD_DEV)$(PART_EXT)2 $(ROOTFS)
+	sudo mkfs.ext4 $(SD_DEV)$(PART_EXT)2
+	sudo mount $(SD_DEV)$(PART_EXT)2 /mnt
+	#sudo tar --strip-components 1 -xf $(ROOTFS) -C /mnt
+	sudo tar -xf $(ROOTFS) -C /mnt
 	sudo umount /mnt
 	sync
 
-sd_kernel: $(DEVICE_TREE_BLOB) $(QUARTUS_RBF) $(KERNEL) $(SD_DEV)1
-	sudo mkdosfs $(SD_DEV)1
-	sudo mount $(SD_DEV)1 /mnt
-	sudo cp $(KERNEL) /mnt/uImage
-	sudo cp $(DEVICE_TREE_BLOB) /mnt/$(PROJECT).dtb
-	sudo cp $(QUARTUS_RBF) /mnt/$(PROJECT).rbf
+sd_kernel: $(DEVICE_TREE_BLOB) $(QUARTUS_RBF) $(KERNEL) $(SD_DEV)$(PART_EXT)1
+	sudo mkdosfs $(SD_DEV)$(PART_EXT)1
+	sudo mount $(SD_DEV)$(PART_EXT)1 /mnt
+	sudo cp $(KERNEL) /mnt/zImage
+	sudo cp $(DEVICE_TREE_BLOB) /mnt/socfpga.dtb
+	sudo cp $(QUARTUS_RBF) /mnt/socfpga.rbf
 	sudo umount /mnt
 	sync
 
-sd_preloader: $(SD_DEV)3
-	sudo dd if=$(PRELOADER_IMG) of=$(SD_DEV)3 bs=64k seek=0
-	sudo dd if=$(UBOOT_IMG) of=/dev/sdx3 bs=64K seek=4
+sd_preloader: $(SD_DEV)$(PART_EXT)3
+	sudo dd if=$(PRELOADER_IMG) of=$(SD_DEV)$(PART_EXT)3 seek=0 count=1
+	sudo dd if=$(UBOOT_IMG) of=$(SD_DEV)$(PART_EXT)3 bs=64K seek=4
 
 sd_prepare: $(SD_DEV)
 	@echo "DEV_BOARD: Bootsel jumpers = 101 (booting from SD)"
 	@echo "DEV_BOARD: MSEL jumpers = 00000 (enable the ARM to configure the FPGA)"
-	sudo dd if=/dev/zero of=$(SDCARD_DEV) bs=512  count=1
-	sudo partprobe $(SDCARD_DEV)
-	@for p in "n p 2 4096 +4496384 t 83" "n p 1 9000000 +20480K t 1 b" "n p 3 2048 +1024K t 3 a2a"; do \
-		unset CMD; \
-		for c in $$p; do \
-			CMD="$$CMD echo $$c;"; \
-		done; \
-		CMD="( $$CMD ) | $(SD_DEV)"; \
-		echo "CREATE PARTITION [$$p]" \
-		eval $$CMD; \
-	done
+	sudo dd if=/dev/zero of=$(SD_DEV) bs=512 count=1
+	# Partition-Table for a 4GB SDCARD
+	@CMD="echo"; for c in n p 3 2048 +1024K t a2 n p 2 4096 +3814368K t 2 83 n p 1 7632896 " " t 1 b w; do \
+		CMD="$$CMD;echo $$c"; \
+	done; \
+	CMD="( $$CMD ) | sudo fdisk $(SD_DEV)"; \
+	echo "CREATE PARTITIONS [$$CMD]"; \
+	eval $$CMD;
+	sudo partprobe $(SD_DEV)
 
 sdcard: $(SD_DEPENDENCY)
 
diff --git a/fpga/syn/sockit.qsf_tmpl b/fpga/syn/sockit.qsf_tmpl
index 8592a17..b5e5dc2 100644
--- a/fpga/syn/sockit.qsf_tmpl
+++ b/fpga/syn/sockit.qsf_tmpl
@@ -501,7 +501,6 @@ set_location_assignment PIN_AF9 -to temp_sclk
 set_location_assignment PIN_AG7 -to temp_mosi
 set_location_assignment PIN_AG1 -to temp_miso
 
-
 #set_instance_assignment -name IO_STANDARD "2.5 V" -to hsmc_clkin_n[1]
 #set_instance_assignment -name IO_STANDARD "2.5 V" -to hsmc_clkin_n[2]
 set_instance_assignment -name IO_STANDARD LVDS -to hsmc_clkin_p[1]
diff --git a/fpga/top/sockit.vhd b/fpga/top/sockit.vhd
index 0dbcff9..b9aaa9c 100644
--- a/fpga/top/sockit.vhd
+++ b/fpga/top/sockit.vhd
@@ -28,9 +28,6 @@ use soc_system.all;
 
 entity sockit is
 	port (
-		clk                                   : in    std_logic;
-		reset_n                               : in    std_logic;
-
 		hps_mem_a                             : out   std_logic_vector(14 downto 0);
 		hps_mem_ba                            : out   std_logic_vector( 2 downto 0);
 		hps_mem_ck                            : out   std_logic;