Skip to contentSkip to conversation

arm:goni: Update configuration for goni target

PATCH New Mateusz Zalega 2 participants 4 messages Oct 14, 2013 – Oct 15, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 arm:goni: Update configuration for goni target

From: Arkadiusz Wlodarczyk <[email protected]>

Configuration file for GONI has been updated to support FAT file system, new mmc partitioning scheme and read linux kernel from eMMC instead of OneNAND.

---
Changes since v3:
- added CMD_EXT4
- made it conform with current, recently accepted USB patches

---
 include/configs/s5p_goni.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
include/configs/s5p_goni.h +14 -4
index c303244..fd441c8 100644
@@ -94,7 +94,7 @@
 
 #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
 
-#define CONFIG_BOOTCOMMAND	"run ubifsboot"
+#define CONFIG_BOOTCOMMAND	"run mmcboot"
 
 #define CONFIG_DEFAULT_CONSOLE	"console=ttySAC2,115200n8\0"
 
@@ -124,7 +124,7 @@
 		"onenand erase 0x01560000 0x1eaa0000;" \
 		"onenand write 0x32000000 0x1260000 0x8C0000\0" \
 	"bootk=" \
-		"onenand read 0x30007FC0 0xc00000 0x600000;" \
+		"run loaduimage;" \
 		"bootm 0x30007FC0\0" \
 	"flashboot=" \
 		"set bootargs root=/dev/mtdblock${bootblock} " \
@@ -143,16 +143,21 @@
 		"set bootargs " CONFIG_RAMDISK_BOOT \
 		" initrd=0x33000000,8M ramdisk=8192\0" \
 	"mmcboot=" \
-		"set bootargs root=${mmcblk} rootfstype=${rootfstype}" \
+		"set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
+		"rootfstype=${rootfstype}" \
 		CONFIG_UBI_MTD " ${opts} ${lcdinfo} " \
 		CONFIG_COMMON_BOOT "; run bootk\0" \
 	"boottrace=setenv opts initcall_debug; run bootcmd\0" \
 	"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
 	"verify=n\0" \
-	"rootfstype=cramfs\0" \
+	"rootfstype=ext4\0" \
 	"console=" CONFIG_DEFAULT_CONSOLE \
 	"mtdparts=" MTDPARTS_DEFAULT \
 	"meminfo=mem=80M mem=256M at 0x40000000 mem=128M at 0x50000000\0" \
+	"loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \
+	"mmcdev=0\0" \
+	"mmcbootpart=2\0" \
+	"mmcrootpart=5\0" \
 	"mmcblk=/dev/mmcblk1p1\0" \
 	"bootblock=9\0" \
 	"ubiblock=8\0" \
@@ -198,6 +203,11 @@
 
 #define CONFIG_DOS_PARTITION		1
 
+/* FAT */
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT4
+#define CONFIG_FAT_WRITE
+
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
 #define CONFIG_SYS_CACHELINE_SIZE       64
Signature · 1 line
1.8.2.1
#1 lore raw

PATCH v4 2/2 arm:goni:dfu Add support for DFU at GONI target

From: Arkadiusz Wlodarczyk <[email protected]>

Proper adjustment for supporting DFU at GONI target has been made. The s5p_goni.h file has been updated. Moreover the code for low level USB initialization has been added to GONI board code.

The malloc pool has been enlarged in order to support larger buffer sizes needed by DFU implementation.

---
Changes since v3:
- adjusted to match recently accepted USB patches

---
 board/samsung/goni/goni.c  | 80 ++++++++++++++++++++++++++++++++++++++++++++++
 include/configs/s5p_goni.h | 69 ++++++++++++++++++++++++++-------------
 2 files changed, 127 insertions(+), 22 deletions(-)
board/samsung/goni/goni.c +80 -0
index 366f648..3a2f686 100644
@@ -13,6 +13,9 @@
 #include <usb/s3c_udc.h>
 #include <asm/arch/cpu.h>
 #include <power/max8998_pmic.h>
+#include <usb.h>
+#include <usb_mass_storage.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 static struct s5pc110_gpio *s5pc110_gpio;
@@ -172,4 +175,81 @@ struct s3c_plat_otg_data s5pc110_otg_data = {
 	.regs_otg = S5PC110_OTG_BASE,
 	.usb_phy_ctrl = S5PC110_USB_PHY_CONTROL,
 };
+
+int board_usb_init(int index, enum board_usb_init_type init)
+{
+	debug("USB_udc_probe\n");
+	s3c_udc_probe(&s5pc110_otg_data);
+	return 0;
+}
+#endif
+
+#ifdef CONFIG_USB_GADGET_MASS_STORAGE
+static int ums_read_sector(struct ums_device *ums_dev,
+				ulong start, lbaint_t blkcnt, void *buf)
+{
+	if (ums_dev->mmc->block_dev.block_read(ums_dev->dev_num,
+					       start + ums_dev->offset,
+					       blkcnt, buf) != blkcnt)
+		return -1;
+
+	return 0;
+}
+
+static int ums_write_sector(struct ums_device *ums_dev,
+				ulong start, lbaint_t blkcnt, const void *buf)
+{
+	if (ums_dev->mmc->block_dev.block_write(ums_dev->dev_num,
+						start + ums_dev->offset,
+						blkcnt, buf) != blkcnt)
+		return -1;
+
+	return 0;
+}
+
+static void ums_get_capacity(struct ums_device *ums_dev,
+					long long int *capacity)
+{
+	long long int tmp_capacity;
+
+	tmp_capacity = (long long int) ((ums_dev->offset + ums_dev->part_size)
+					* SECTOR_SIZE);
+	*capacity = ums_dev->mmc->capacity - tmp_capacity;
+}
+
+static struct ums_board_info ums_board = {
+	.read_sector = ums_read_sector,
+	.write_sector = ums_write_sector,
+	.get_capacity = ums_get_capacity,
+	.name = "GONI UMS disk",
+	.ums_dev = {
+		.mmc = NULL,
+		.dev_num = 0,
+		.offset = 0,
+		.part_size = 0.
+	},
+};
+
+struct ums_board_info *board_ums_init(unsigned int dev_num, unsigned int offset,
+					unsigned int part_size)
+{
+	struct mmc *mmc;
+
+	mmc = find_mmc_device(dev_num);
+	/*
+	 * mmc initialization is necessary prior to the ums command usage
+	 * due to fact that on goni target environment is read from oneNand
+	 * memory, so the mmc remains uninitialized when u-boot prompt appears
+	 */
+	if (!mmc || mmc_init(mmc))
+		return NULL;
+
+	ums_board.ums_dev.mmc = mmc;
+	ums_board.ums_dev.dev_num = dev_num;
+	ums_board.ums_dev.offset = offset;
+	ums_board.ums_dev.part_size = part_size;
+
+	return &ums_board;
+}
+
 #endif
include/configs/s5p_goni.h +47 -22

119 lines not on this page · raw message

Signature · 1 line
1.8.2.1
#2 lore raw

PATCH v4 2/2 arm:goni:dfu Add support for DFU at GONI target

Hello Mateusz,

Quoted 22 lines · Mateusz Zalega

From: Arkadiusz Wlodarczyk <[email protected]>

Proper adjustment for supporting DFU at GONI target has been made. The s5p_goni.h file has been updated. Moreover the code for low level USB initialization has been added to GONI board code.

The malloc pool has been enlarged in order to support larger buffer sizes needed by DFU implementation.

---
Changes since v3:
- adjusted to match recently accepted USB patches
---

board/samsung/goni/goni.c struct s3c_plat_otg_data s5pc110_otg_data = { · line 186

Quoted 8 lines
board/samsung/goni/goni.c +8 -0
+int board_usb_init(int index, enum board_usb_init_type init)
+{
+	debug("USB_udc_probe\n");
+	s3c_udc_probe(&s5pc110_otg_data);
+	return 0;
+}
+#endif
+

----- starting from this line of your patch

board/samsung/goni/goni.c struct s3c_plat_otg_data s5pc110_otg_data = { · line 189

Quoted 3 lines
board/samsung/goni/goni.c +3 -0
+#ifdef CONFIG_USB_GADGET_MASS_STORAGE
+static int ums_read_sector(struct ums_device *ums_dev,
+				ulong start, lbaint_t blkcnt, void *buf)

----- with all these lines inside...

board/samsung/goni/goni.c struct s3c_plat_otg_data s5pc110_otg_data = { · line 255

Quoted 9 lines
board/samsung/goni/goni.c +8 -0
+	ums_board.ums_dev.mmc = mmc;
+	ums_board.ums_dev.dev_num = dev_num;
+	ums_board.ums_dev.offset = offset;
+	ums_board.ums_dev.part_size = part_size;
+
+	return &ums_board;
+}
+
  #endif

----- end this line

Will be not needed, because I would like to move ums initialization code to Samsung common directory.
Could you wait with this patch please or just don't enable this feature on goni at this time? Other way I have to remove those lines in my patch set which I'm gonna send tomorrow.

After my ums refactoring patch set this two below lines will be enought to enable UMS on goni without ums init code and only with board usb init.

include/configs/s5p_goni.h line 261

Quoted 5 lines
include/configs/s5p_goni.h +2 -0
+#define CONFIG_CMD_USB_MASS_STORAGE
+#define CONFIG_USB_GADGET_MASS_STORAGE
 
  #endif	/* __CONFIG_H */

Thank you,

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#3 lore raw

PATCH v4 1/2 arm:goni: Update configuration for goni target

In reply to Mateusz Zalega
Quoted 54 lines · Mateusz Zalega

From: Arkadiusz Wlodarczyk <[email protected]>

Configuration file for GONI has been updated to support FAT file system, new mmc partitioning scheme and read linux kernel from eMMC instead of OneNAND.

---
Changes since v3:
- added CMD_EXT4
- made it conform with current, recently accepted USB patches

---
  include/configs/s5p_goni.h | 18 ++++++++++++++----
  1 file changed, 14 insertions(+), 4 deletions(-)
include/configs/s5p_goni.h +4 -3
index c303244..fd441c8 100644
@@ -94,7 +94,7 @@
 
  #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
 
-#define CONFIG_BOOTCOMMAND	"run ubifsboot"
+#define CONFIG_BOOTCOMMAND	"run mmcboot"
 
  #define CONFIG_DEFAULT_CONSOLE	"console=ttySAC2,115200n8\0"
 
@@ -124,7 +124,7 @@
  		"onenand erase 0x01560000 0x1eaa0000;" \
  		"onenand write 0x32000000 0x1260000 0x8C0000\0" \
  	"bootk=" \
-		"onenand read 0x30007FC0 0xc00000 0x600000;" \
+		"run loaduimage;" \
  		"bootm 0x30007FC0\0" \
  	"flashboot=" \
  		"set bootargs root=/dev/mtdblock${bootblock} " \
@@ -143,16 +143,21 @@
  		"set bootargs " CONFIG_RAMDISK_BOOT \
  		" initrd=0x33000000,8M ramdisk=8192\0" \
  	"mmcboot=" \
-		"set bootargs root=${mmcblk} rootfstype=${rootfstype}" \
+		"set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
+		"rootfstype=${rootfstype}" \
  		CONFIG_UBI_MTD " ${opts} ${lcdinfo} " \
  		CONFIG_COMMON_BOOT "; run bootk\0" \
  	"boottrace=setenv opts initcall_debug; run bootcmd\0" \
  	"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
  	"verify=n\0" \

include/configs/s5p_goni.h line 161

Quoted 10 lines
include/configs/s5p_goni.h +5 -1
-	"rootfstype=cramfs\0" \
+	"rootfstype=ext4\0" \
  	"console=" CONFIG_DEFAULT_CONSOLE \
  	"mtdparts=" MTDPARTS_DEFAULT \
  	"meminfo=mem=80M mem=256M at 0x40000000 mem=128M at 0x50000000\0" \
+	"loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \
+	"mmcdev=0\0" \
+	"mmcbootpart=2\0" \
+	"mmcrootpart=5\0" \
  	"mmcblk=/dev/mmcblk1p1\0" \

"mmcblk" - is it used anywhere?

include/configs/s5p_goni.h line 210

Quoted 11 lines
include/configs/s5p_goni.h +5 -0
  	"bootblock=9\0" \
  	"ubiblock=8\0" \
@@ -198,6 +203,11 @@
 
  #define CONFIG_DOS_PARTITION		1
 
+/* FAT */
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT4
+#define CONFIG_FAT_WRITE
+

There is also separate write config for ext4.

Quoted 4 lines
include/configs/s5p_goni.h +0 -0
  #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
  #define CONFIG_SYS_CACHELINE_SIZE       64
Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com