| Message ID | 1361182686-16882-1-git-send-email-a.wlodarczyk@samsung.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Minkyu Kang |
| Headers | show |
Dear Arkadiusz Wlodarczyk, On 18/02/13 19:18, a.wlodarczyk@samsung.com wrote: > From: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com> > > Signed-off-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > Tested-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com> > Cc: Minkyu Kang <mk7.kang@samsung.com> > --- > Changes > This change encompasses set of adjustments in the configuration > of the u-boot in the include/configs/s5p_goni.h, particularly > change of rootfs type, change in kernel booting method and added DFU > support. All those changes are connected with adjusting of existing > goni configuration to latest changes in kernel. > --- > board/samsung/goni/goni.c | 7 +++++++ > include/configs/s5p_goni.h | 37 ++++++++++++++++++++++++++++++++----- > 2 files changed, 39 insertions(+), 5 deletions(-) > > diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c > index ff76963..3c53106 100644 > --- a/board/samsung/goni/goni.c > +++ b/board/samsung/goni/goni.c > @@ -155,4 +155,11 @@ struct s3c_plat_otg_data s5pc110_otg_data = { > .regs_otg = S5PC110_OTG_BASE, > .usb_phy_ctrl = S5PC110_USB_PHY_CONTROL, > }; > + > +void board_usb_init(void) > +{ > + debug("USB_udc_probe\n"); > + s3c_udc_probe(&s5pc110_otg_data); > +} I think, this is unrelated changes to subject. > + > #endif > diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h > index 56e8347..8a824c7 100644 > --- a/include/configs/s5p_goni.h > +++ b/include/configs/s5p_goni.h > @@ -86,6 +86,17 @@ > #define CONFIG_CMD_ONENAND > #define CONFIG_CMD_MTDPARTS > #define CONFIG_CMD_MMC > +#define CONFIG_CMD_DFU > + > +/* USB Composite download gadget - g_dnl */ > +#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_DFU_FUNCTION > +#define CONFIG_DFU_MMC > + > +/* USB Samsung's IDs */ > +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 > +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 > +#define CONFIG_G_DNL_MANUFACTURER "Samsung" > > #define CONFIG_BOOTDELAY 1 > #define CONFIG_ZERO_BOOTDELAY_CHECK > @@ -105,9 +116,13 @@ > ",60m(qboot)"\ > ",-(UBI)\0" > > +#define CONFIG_DFU_ALT \ > + "u-boot mmc 80 400;" \ > + "uImage fat 0 2\0" \ > + > #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT > > -#define CONFIG_BOOTCOMMAND "run ubifsboot" > +#define CONFIG_BOOTCOMMAND "run mmcboot" > > #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" > > @@ -137,7 +152,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} " \ > @@ -156,21 +171,28 @@ > "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@0x40000000 mem=128M@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" \ > "ubi=enabled\0" \ > - "opts=always_resume=1" > + "opts=always_resume=1\0" \ > + "dfu_alt_info=" CONFIG_DFU_ALT > + > > /* Miscellaneous configurable options */ > #define CONFIG_SYS_LONGHELP /* undef to save memory */ > @@ -211,6 +233,10 @@ > > #define CONFIG_DOS_PARTITION 1 > > +/* FAT */ > +#define CONFIG_CMD_FAT > +#define CONFIG_FAT_WRITE > + > #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) > > #define CONFIG_SYS_CACHELINE_SIZE 64 > @@ -233,5 +259,6 @@ > #define CONFIG_USB_GADGET > #define CONFIG_USB_GADGET_S3C_UDC_OTG > #define CONFIG_USB_GADGET_DUALSPEED > +#define CONFIG_USB_GADGET_VBUS_DRAW 2 > > #endif /* __CONFIG_H */ > Thanks, Minkyu Kang.
Dear Minkyu Kang, As I understood, you marked that adding of the void board_usb_init(void) function implementation to the board/samsung/goni/goni.c file is unrelated to the subject of the patch. I would like to explain, that I added the board_usb_init implementation because the function is used by the dfu u-boot command. The patch switches this command on for the goni target, so to allow the source to compile and work for goni target, implementation of the function is necessary. Due to the above I would like to keep this part of the patch unchanged. Thanks, Arek Wlodarczyk. -----Original Message----- From: Minkyu Kang [mailto:mk7.kang@samsung.com] Sent: Wednesday, March 27, 2013 3:18 AM To: a.wlodarczyk@samsung.com Cc: u-boot@lists.denx.de; l.majewski@samsung.com; Kyungmin Park Subject: Re: [PATCH 1/3] arm:goni: Adjustment of configuration for goni target Dear Arkadiusz Wlodarczyk, On 18/02/13 19:18, a.wlodarczyk@samsung.com wrote: > From: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com> > > Signed-off-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > Tested-by: Arkadiusz Wlodarczyk <a.wlodarczyk@samsung.com> > Cc: Minkyu Kang <mk7.kang@samsung.com> > --- > Changes > This change encompasses set of adjustments in the configuration of the > u-boot in the include/configs/s5p_goni.h, particularly change of > rootfs type, change in kernel booting method and added DFU support. > All those changes are connected with adjusting of existing goni > configuration to latest changes in kernel. > --- > board/samsung/goni/goni.c | 7 +++++++ > include/configs/s5p_goni.h | 37 ++++++++++++++++++++++++++++++++----- > 2 files changed, 39 insertions(+), 5 deletions(-) > > diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c > index ff76963..3c53106 100644 > --- a/board/samsung/goni/goni.c > +++ b/board/samsung/goni/goni.c > @@ -155,4 +155,11 @@ struct s3c_plat_otg_data s5pc110_otg_data = { > .regs_otg = S5PC110_OTG_BASE, > .usb_phy_ctrl = S5PC110_USB_PHY_CONTROL, }; > + > +void board_usb_init(void) > +{ > + debug("USB_udc_probe\n"); > + s3c_udc_probe(&s5pc110_otg_data); > +} I think, this is unrelated changes to subject. > + > #endif > diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h > index 56e8347..8a824c7 100644 > --- a/include/configs/s5p_goni.h > +++ b/include/configs/s5p_goni.h > @@ -86,6 +86,17 @@ > #define CONFIG_CMD_ONENAND > #define CONFIG_CMD_MTDPARTS > #define CONFIG_CMD_MMC > +#define CONFIG_CMD_DFU > + > +/* USB Composite download gadget - g_dnl */ #define > +CONFIG_USBDOWNLOAD_GADGET #define CONFIG_DFU_FUNCTION #define > +CONFIG_DFU_MMC > + > +/* USB Samsung's IDs */ > +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 #define > +CONFIG_G_DNL_PRODUCT_NUM 0x6601 #define CONFIG_G_DNL_MANUFACTURER > +"Samsung" > > #define CONFIG_BOOTDELAY 1 > #define CONFIG_ZERO_BOOTDELAY_CHECK > @@ -105,9 +116,13 @@ > ",60m(qboot)"\ > ",-(UBI)\0" > > +#define CONFIG_DFU_ALT \ > + "u-boot mmc 80 400;" \ > + "uImage fat 0 2\0" \ > + > #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT > > -#define CONFIG_BOOTCOMMAND "run ubifsboot" > +#define CONFIG_BOOTCOMMAND "run mmcboot" > > #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" > > @@ -137,7 +152,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} " \ @@ -156,21 +171,28 > @@ > "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@0x40000000 mem=128M@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" \ > "ubi=enabled\0" \ > - "opts=always_resume=1" > + "opts=always_resume=1\0" \ > + "dfu_alt_info=" CONFIG_DFU_ALT > + > > /* Miscellaneous configurable options */ > #define CONFIG_SYS_LONGHELP /* undef to save memory */ > @@ -211,6 +233,10 @@ > > #define CONFIG_DOS_PARTITION 1 > > +/* FAT */ > +#define CONFIG_CMD_FAT > +#define CONFIG_FAT_WRITE > + > #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) > > #define CONFIG_SYS_CACHELINE_SIZE 64 > @@ -233,5 +259,6 @@ > #define CONFIG_USB_GADGET > #define CONFIG_USB_GADGET_S3C_UDC_OTG #define > CONFIG_USB_GADGET_DUALSPEED > +#define CONFIG_USB_GADGET_VBUS_DRAW 2 > > #endif /* __CONFIG_H */ > Thanks, Minkyu Kang.
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index ff76963..3c53106 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -155,4 +155,11 @@ struct s3c_plat_otg_data s5pc110_otg_data = { .regs_otg = S5PC110_OTG_BASE, .usb_phy_ctrl = S5PC110_USB_PHY_CONTROL, }; + +void board_usb_init(void) +{ + debug("USB_udc_probe\n"); + s3c_udc_probe(&s5pc110_otg_data); +} + #endif diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 56e8347..8a824c7 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -86,6 +86,17 @@ #define CONFIG_CMD_ONENAND #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MMC +#define CONFIG_CMD_DFU + +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC + +/* USB Samsung's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 +#define CONFIG_G_DNL_MANUFACTURER "Samsung" #define CONFIG_BOOTDELAY 1 #define CONFIG_ZERO_BOOTDELAY_CHECK @@ -105,9 +116,13 @@ ",60m(qboot)"\ ",-(UBI)\0" +#define CONFIG_DFU_ALT \ + "u-boot mmc 80 400;" \ + "uImage fat 0 2\0" \ + #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT -#define CONFIG_BOOTCOMMAND "run ubifsboot" +#define CONFIG_BOOTCOMMAND "run mmcboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" @@ -137,7 +152,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} " \ @@ -156,21 +171,28 @@ "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@0x40000000 mem=128M@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" \ "ubi=enabled\0" \ - "opts=always_resume=1" + "opts=always_resume=1\0" \ + "dfu_alt_info=" CONFIG_DFU_ALT + /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ @@ -211,6 +233,10 @@ #define CONFIG_DOS_PARTITION 1 +/* FAT */ +#define CONFIG_CMD_FAT +#define CONFIG_FAT_WRITE + #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define CONFIG_SYS_CACHELINE_SIZE 64 @@ -233,5 +259,6 @@ #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_S3C_UDC_OTG #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 2 #endif /* __CONFIG_H */