[PATCH 0/2] Small fixes

[PATCH 0/2] Small fixes

[Roberto Nibali]

While going through my current git tree, I have found two minor things I
wanted to offload to master. Please review and consider applying.

Roberto Nibali (2):
  Remove superfluous SYSCTL_RSTA
  Deal properly with scripts/bareboxenv-target

 .gitignore              |    1 +
 Makefile                |    1 +
 drivers/mci/imx-esdhc.h |    1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/2] Remove superfluous SYSCTL_RSTA

[Roberto Nibali]

Signed-off-by: Roberto Nibali <rnibali@gmail.com>
---
 drivers/mci/imx-esdhc.h |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mci/imx-esdhc.h b/drivers/mci/imx-esdhc.h
index e5cf884..d9be69e 100644
--- a/drivers/mci/imx-esdhc.h
+++ b/drivers/mci/imx-esdhc.h
@@ -39,7 +39,6 @@
 #define SYSCTL_PEREN		0x00000004
 #define SYSCTL_HCKEN		0x00000002
 #define SYSCTL_IPGEN		0x00000001
-#define SYSCTL_RSTA		0x01000000
 
 #define IRQSTAT			0x0002e030
 #define IRQSTAT_DMAE		(0x10000000)
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] Deal properly with scripts/bareboxenv-target

[Roberto Nibali]

The bareboxenv-target binary is automatically created but never
deleted nor is it excluded from git tracking. This patch remedies
the situation by adding scripts/bareboxenv-target to .gitignnore
and adjusting the list of to be deleted files of the 'clean' target
in the core Makefile.

Signed-off-by: Roberto Nibali <rnibali@gmail.com>
---
 .gitignore |    1 +
 Makefile   |    1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index df0ed2c..fd429fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ cscope.*
 *.patch
 scripts/gen_netx_image
 scripts/s5p_cksum
+scripts/bareboxenv-target
diff --git a/Makefile b/Makefile
index 9294049..3756eac 100644
--- a/Makefile
+++ b/Makefile
@@ -1003,6 +1003,7 @@ CLEAN_DIRS  += $(MODVERDIR)
 CLEAN_FILES +=	barebox System.map include/generated/barebox_default_env.h \
                 .tmp_version .tmp_barebox* barebox.bin barebox.map barebox.S \
 		.tmp_kallsyms* barebox_default_env* barebox.ldr \
+		scripts/bareboxenv-target \
 		Doxyfile.version barebox.srec barebox.s5p
 
 # Directories & files removed with 'make mrproper'
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/2] Small fixes

[Sascha Hauer]

On Fri, Jun 15, 2012 at 12:08:13PM +0200, Roberto Nibali wrote:
> While going through my current git tree, I have found two minor things I
> wanted to offload to master. Please review and consider applying.
> 
> Roberto Nibali (2):
>   Remove superfluous SYSCTL_RSTA
>   Deal properly with scripts/bareboxenv-target

Applied, thanks

Sascha

> 
>  .gitignore              |    1 +
>  Makefile                |    1 +
>  drivers/mci/imx-esdhc.h |    1 -
>  3 files changed, 2 insertions(+), 1 deletion(-)
> 
> -- 
> 1.7.9.5
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox