| Message ID | 20200417070653.988867-1-mrjoel@lixil.net |
|---|---|
| State | Accepted |
| Commit | 36d61a3d0ae6d5ad0838a5ccb427df12102d02ad |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | arm: mvebu: clearfog: adjust SCSI boot duplication | expand |
On 17.04.20 09:06, Joel Johnson wrote: > Fix duplication resulting from merging of multiple related series. > Commits cecf38a75, bd02fd29f, and 201a500de added or adjusted SCSI > boot support for ClearFog, but in slightly different locations which > didn't result in a merge conflict. > > Signed-off-by: Joel Johnson <mrjoel@lixil.net> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > > include/configs/clearfog.h | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h > index 8314956db6..53ff830e81 100644 > --- a/include/configs/clearfog.h > +++ b/include/configs/clearfog.h > @@ -104,12 +104,6 @@ > #define BOOT_TARGET_DEVICES_MMC(func) > #endif > > -#ifdef CONFIG_SCSI > -#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) > -#else > -#define BOOT_TARGET_DEVICES_SCSI(func) > -#endif > - > #ifdef CONFIG_USB_STORAGE > #define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) > #else > @@ -152,7 +146,6 @@ > */ > #define BOOT_TARGET_DEVICES(func) \ > BOOT_TARGET_DEVICES_MMC(func) \ > - BOOT_TARGET_DEVICES_SCSI(func) \ > BOOT_TARGET_DEVICES_USB(func) \ > BOOT_TARGET_DEVICES_SCSI_BUS0(func) \ > BOOT_TARGET_DEVICES_SCSI_BUS1(func) \ > Viele Grüße, Stefan
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 8314956db6..53ff830e81 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -104,12 +104,6 @@ #define BOOT_TARGET_DEVICES_MMC(func) #endif -#ifdef CONFIG_SCSI -#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) -#else -#define BOOT_TARGET_DEVICES_SCSI(func) -#endif - #ifdef CONFIG_USB_STORAGE #define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) #else @@ -152,7 +146,6 @@ */ #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ - BOOT_TARGET_DEVICES_SCSI(func) \ BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_SCSI_BUS0(func) \ BOOT_TARGET_DEVICES_SCSI_BUS1(func) \
Fix duplication resulting from merging of multiple related series. Commits cecf38a75, bd02fd29f, and 201a500de added or adjusted SCSI boot support for ClearFog, but in slightly different locations which didn't result in a merge conflict. Signed-off-by: Joel Johnson <mrjoel@lixil.net> --- include/configs/clearfog.h | 7 ------- 1 file changed, 7 deletions(-)