Skip to contentSkip to conversation

hwmon: cleaning patch

U-Boot-Users New monstr at seznam.cz 3 participants 11 messages Jul 11, 2008 – Jul 14, 2008

Subsystems (2)
Hardware monitoring LM73 hardware monitor driver
lore
Share & tools
lore

monstr at seznam.cz

author
#0 lore raw

Hi Stefan and Wolfgang,

here is hw_mon cleaning patch.
Sorry for long dalay. :-)

Michal

author
#1 lore raw

PATCH 1/1 FIS: repare incorrect return value with ramdisk handling

From: Michal Simek <[email protected]>

Microblaze and PowerPC use boot_get_ramdisk for loading ramdisk to memory with checking return value. Return 0 means success. Return 1 means failed. Here is correspond part of code from bootm.c which check return code.

ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC,

		&rd_data_start, &rd_data_end);
if (ret)
	goto error;
Signed-off-by Michal Simek <[email protected]>
---
 common/image.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
common/image.c +8 -8
index 4a024d4..4a4472f 100644
@@ -826,13 +826,13 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
 			cfg_noffset = fit_conf_get_node (fit_hdr, fit_uname_config);
 			if (cfg_noffset < 0) {
 				debug ("*  ramdisk: no such config\n");
-				return 0;
+				return 1;
 			}
 
 			rd_noffset = fit_conf_get_ramdisk_node (fit_hdr, cfg_noffset);
 			if (rd_noffset < 0) {
 				debug ("*  ramdisk: no ramdisk in config\n");
-				return 0;
+				return 1;
 			}
 		}
 #endif

@@ -871,7 +871,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
 			if (!fit_check_format (fit_hdr)) {
 				puts ("Bad FIT ramdisk image format!\n");
 				show_boot_progress (-120);
-				return 0;
+				return 1;
 			}
 			show_boot_progress (121);
 

@@ -886,7 +886,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
 				if (cfg_noffset < 0) {
 					puts ("Could not find configuration node\n");
 					show_boot_progress (-122);
-					return 0;
+					return 1;
 				}
 				fit_uname_config = fdt_get_name (fit_hdr, cfg_noffset, NULL);
 				printf ("   Using '%s' configuration\n", fit_uname_config);

@@ -901,20 +901,20 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
 			if (rd_noffset < 0) {
 				puts ("Could not find subimage node\n");
 				show_boot_progress (-124);
-				return 0;
+				return 1;
 			}
 
 			printf ("   Trying '%s' ramdisk subimage\n", fit_uname_ramdisk);
 
 			show_boot_progress (125);
 			if (!fit_check_ramdisk (fit_hdr, rd_noffset, arch, images->verify))
-				return 0;
+				return 1;
 
 			/* get ramdisk image data address and length */
 			if (fit_image_get_data (fit_hdr, rd_noffset, &data, &size)) {
 				puts ("Could not find ramdisk subimage data!\n");
 				show_boot_progress (-127);
-				return 0;
+				return 1;
 			}
 			show_boot_progress (128);
 

@@ -924,7 +924,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
 			if (fit_image_get_load (fit_hdr, rd_noffset, &rd_load)) {
 				puts ("Can't get ramdisk subimage load address!\n");
 				show_boot_progress (-129);
-				return 0;
+				return 1;
 			}
 			show_boot_progress (129);
Signature · 1 line
1.5.4.GIT
author
#2 lore raw

PATCH 1/1 hwmon: Cleaning hwmon devices

From: Michal Simek <[email protected]>

Clean Makefile
Move device specific values to driver for better reading

Signed-off-by Michal Simek <[email protected]>
---
 drivers/hwmon/Makefile  |   12 ++++----
 drivers/hwmon/adm1021.c |   35 +++++++++++++++++++--
 drivers/hwmon/ds1621.c  |   12 +++++--
 drivers/hwmon/ds1722.c  |    5 ---
 drivers/hwmon/ds1775.c  |    8 ++--
 drivers/hwmon/lm73.c    |    6 ++++
 drivers/hwmon/lm75.c    |    8 ++--
 drivers/hwmon/lm81.c    |    8 +++--
 include/dtt.h           |   77 +---------------------------------------------
 9 files changed, 66 insertions(+), 105 deletions(-)
drivers/hwmon/Makefile +6 -6
index 065433a..61b028f 100644
@@ -30,13 +30,13 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)libhwmon.a
 
-COBJS-y += adm1021.o
-COBJS-y += ds1621.o
-COBJS-y += ds1722.o
-COBJS-y += ds1775.o
+COBJS-$(CONFIG_DTT_ADM1021) += adm1021.o
+COBJS-$(CONFIG_DTT_DS1621) += ds1621.o
+COBJS-$(CONFIG_DS1722) += ds1722.o
+COBJS-$(CONFIG_DTT_DS1775) += ds1775.o
 COBJS-$(CONFIG_DTT_LM73) += lm73.o
-COBJS-y += lm75.o
-COBJS-y += lm81.o
+COBJS-$(CONFIG_DTT_LM75) += lm75.o
+COBJS-$(CONFIG_DTT_LM81) += lm81.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
drivers/hwmon/adm1021.c +31 -4
index 9f65cfb..b791ec0 100644
@@ -33,11 +33,40 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DTT_ADM1021
-
 #include <i2c.h>
 #include <dtt.h>
 
+#define DTT_READ_LOC_VALUE	0x00
+#define DTT_READ_REM_VALUE	0x01
+#define DTT_READ_STATUS		0x02
+#define DTT_READ_CONFIG		0x03
+#define DTT_READ_CONVRATE	0x04
+#define DTT_READ_LOC_HIGHLIM	0x05
+#define DTT_READ_LOC_LOWLIM	0x06
+#define DTT_READ_REM_HIGHLIM	0x07
+#define DTT_READ_REM_LOWLIM	0x08
+#define DTT_READ_DEVID		0xfe
+
+#define DTT_WRITE_CONFIG	0x09
+#define DTT_WRITE_CONVRATE	0x0a
+#define DTT_WRITE_LOC_HIGHLIM	0x0b
+#define DTT_WRITE_LOC_LOWLIM	0x0c
+#define DTT_WRITE_REM_HIGHLIM	0x0d
+#define DTT_WRITE_REM_LOWLIM	0x0e
+#define DTT_WRITE_ONESHOT	0x0f
+
+#define DTT_STATUS_BUSY		0x80	/* 1=ADC Converting */
+#define DTT_STATUS_LHIGH	0x40	/* 1=Local High Temp Limit Tripped */
+#define DTT_STATUS_LLOW		0x20	/* 1=Local Low Temp Limit Tripped */
+#define DTT_STATUS_RHIGH	0x10	/* 1=Remote High Temp Limit Tripped */
+#define DTT_STATUS_RLOW		0x08	/* 1=Remote Low Temp Limit Tripped */
+#define DTT_STATUS_OPEN		0x04	/* 1=Remote Sensor Open-Circuit */
+
+#define DTT_CONFIG_ALERT_MASKED	0x80	/* 0=ALERT Enabled, 1=ALERT Masked */
+#define DTT_CONFIG_STANDBY	0x40	/* 0=Run, 1=Standby */
+
+#define DTT_ADM1021_DEVID	0x41
+
 typedef
 	struct {
 		uint i2c_addr:7;	/* 7bit i2c chip address */

@@ -170,5 +199,3 @@ dtt_get_temp (int sensor)
 
 	return (int) val;
 } /* dtt_get_temp() */
-
-#endif /* CONFIG_DTT_ADM1021 */
drivers/hwmon/ds1621.c +8 -4
index 4948181..749aa26 100644
@@ -27,7 +27,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DTT_DS1621
 #if !defined(CFG_EEPROM_PAGE_WRITE_ENABLE) || \
 	(CFG_EEPROM_PAGE_WRITE_BITS < 1)
 # error "CFG_EEPROM_PAGE_WRITE_ENABLE must be defined and CFG_EEPROM_PAGE_WRITE_BITS must be greater than 1 to use CONFIG_DTT_DS1621"

@@ -39,6 +38,14 @@
  * Device code
  */
 #define DTT_I2C_DEV_CODE 0x48			/* Dallas Semi's DS1621 */
+#define DTT_READ_TEMP		0xAA
+#define DTT_READ_COUNTER	0xA8
+#define DTT_READ_SLOPE		0xA9
+#define DTT_WRITE_START_CONV	0xEE
+#define DTT_WRITE_STOP_CONV	0x22
+#define DTT_TEMP_HIGH		0xA1
+#define DTT_TEMP_LOW		0xA2
+#define DTT_CONFIG		0xAC
 
 int dtt_read(int sensor, int reg)
 {

@@ -185,6 +192,3 @@ int dtt_get_temp(int sensor)
 
     return (dtt_read(sensor, DTT_READ_TEMP) / 256);
 } /* dtt_get_temp() */
-
-
-#endif /* CONFIG_DTT_DS1621 */
drivers/hwmon/ds1722.c +0 -5
index c19ee01..7e2f1ed 100644
@@ -1,8 +1,5 @@
 
 #include <common.h>
-
-#ifdef CONFIG_DS1722
-
 #include <ssi.h>
 
 static void ds1722_select(int dev)

@@ -138,5 +135,3 @@ int ds1722_probe(int dev)
 	printf("%d.%d deg C\n\n", (char)(temp >> 8), temp & 0xff);
 	return 0;
 }
-
-#endif
drivers/hwmon/ds1775.c +4 -4
index 0fbb0b4..6a4d8e5 100644
@@ -21,11 +21,14 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DTT_DS1775
 #include <i2c.h>
 #include <dtt.h>
 
 #define DTT_I2C_DEV_CODE	CFG_I2C_DTT_ADDR /* Dallas Semi's DS1775 device code */
+#define DTT_READ_TEMP		0x0
+#define DTT_CONFIG		0x1
+#define DTT_TEMP_HYST		0x2
+#define DTT_TEMP_OS		0x3
 
 int dtt_read(int sensor, int reg)
 {

@@ -151,6 +154,3 @@ int dtt_get_temp(int sensor)
 {
 	return (dtt_read(sensor, DTT_READ_TEMP) / 256);
 }
-
-
-#endif /* CONFIG_DTT_DS1775 */
drivers/hwmon/lm73.c +6 -0
index 98e8bd2..dd24683 100644
@@ -38,6 +38,12 @@
  * Device code
  */
 #define DTT_I2C_DEV_CODE 0x48	/* National Semi's LM73 device */
+#define DTT_READ_TEMP		0x0
+#define DTT_CONFIG		0x1
+#define DTT_TEMP_HIGH		0x2
+#define DTT_TEMP_LOW		0x3
+#define DTT_CONTROL		0x4
+#define DTT_ID			0x7
 
 int dtt_read(int const sensor, int const reg)
 {
drivers/hwmon/lm75.c +4 -4
index e29b294..0d24d4a 100644
@@ -27,7 +27,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DTT_LM75
 #if !defined(CFG_EEPROM_PAGE_WRITE_ENABLE) || \
 	(CFG_EEPROM_PAGE_WRITE_BITS < 1)
 # error "CFG_EEPROM_PAGE_WRITE_ENABLE must be defined and CFG_EEPROM_PAGE_WRITE_BITS must be greater than  1 to use CONFIG_DTT_LM75"

@@ -36,11 +35,14 @@
 #include <i2c.h>
 #include <dtt.h>
 
-
 /*
  * Device code
  */
 #define DTT_I2C_DEV_CODE 0x48			/* ON Semi's LM75 device */
+#define DTT_READ_TEMP		0x0
+#define DTT_CONFIG		0x1
+#define DTT_TEMP_HYST		0x2
+#define DTT_TEMP_SET		0x3
 
 int dtt_read(int sensor, int reg)
 {

@@ -187,5 +189,3 @@ int dtt_get_temp(int sensor)
     }
     return (int)((int16_t) ret / 256);
 } /* dtt_get_temp() */
-
-#endif /* CONFIG_DTT_LM75 */
drivers/hwmon/lm81.c +5 -3
index 03bc53d..9349eb6 100644
@@ -32,7 +32,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DTT_LM81
 #if !defined(CFG_EEPROM_PAGE_WRITE_ENABLE) || \
 	(CFG_EEPROM_PAGE_WRITE_BITS < 1)
 # error "CFG_EEPROM_PAGE_WRITE_ENABLE must be defined and CFG_EEPROM_PAGE_WRITE_BITS must be greater than  1 to use CONFIG_DTT_LM81"

@@ -45,6 +44,11 @@
  * Device code
  */
 #define DTT_I2C_DEV_CODE 0x2c			/* ON Semi's LM81 device */
+#define DTT_READ_TEMP		0x27
+#define DTT_CONFIG_TEMP		0x4b
+#define DTT_TEMP_MAX		0x39
+#define DTT_TEMP_HYST		0x3a
+#define DTT_CONFIG		0x40
 
 int dtt_read(int sensor, int reg)
 {

@@ -144,5 +148,3 @@ int dtt_get_temp(int sensor)
 
 	return (TEMP_FROM_REG((val << 1) + ((tmpcnf & 0x80) >> 7))) / 10;
 } /* dtt_get_temp() */
-
-#endif /* CONFIG_DTT_LM81 */
include/dtt.h +2 -75

90 lines not on this page · raw message

Signature · 1 line
1.5.4.GIT
#3 lore raw

PATCH 1/1 hwmon: Cleaning hwmon devices

Quoted 4 lines · monstr at seznam.cz

From: Michal Simek <[email protected]>

Clean Makefile
Move device specific values to driver for better reading

Thanks. One comment below though:

Quoted 19 lines
Signed-off-by Michal Simek <[email protected]>
---
 drivers/hwmon/Makefile  |   12 ++++----
 drivers/hwmon/adm1021.c |   35 +++++++++++++++++++--
 drivers/hwmon/ds1621.c  |   12 +++++--
 drivers/hwmon/ds1722.c  |    5 ---
 drivers/hwmon/ds1775.c  |    8 ++--
 drivers/hwmon/lm73.c    |    6 ++++
 drivers/hwmon/lm75.c    |    8 ++--
 drivers/hwmon/lm81.c    |    8 +++--
 include/dtt.h           |   77

+--------------------------------------------- 9 files changed, 66 insertions(+), 105 deletions(-)

drivers/hwmon/Makefile +0 -0
index 065433a..61b028f 100644

drivers/hwmon/Makefile include $(TOPDIR)/config.mk · line 35

Quoted 10 lines
drivers/hwmon/Makefile +3 -4
@@ -30,13 +30,13 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)libhwmon.a
 
-COBJS-y += adm1021.o
-COBJS-y += ds1621.o
-COBJS-y += ds1722.o
-COBJS-y += ds1775.o
+COBJS-$(CONFIG_DTT_ADM1021) += adm1021.o
+COBJS-$(CONFIG_DTT_DS1621) += ds1621.o
+COBJS-$(CONFIG_DS1722) += ds1722.o

CONFIG_DS1722 does not match the "CONFIG_DTT_foo" idea all other sensors are using. Perhaps you could fix this up too (CONFIG_DS1722 -> CONFIG_DTT_DS1722) with another version of this patch?

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

author
#4 lore raw

PATCH 1/1 hwmon: Cleaning hwmon devices

Quoted 7 lines

From: Michal Simek <[email protected]>

Clean Makefile
Move device specific values to driver for better reading

Thanks. One comment below though:

you are welcome

Quoted 11 lines

drivers/hwmon/Makefile include $(TOPDIR)/config.mk · line 35

Quoted 7 lines
drivers/hwmon/Makefile +3 -4
-COBJS-y += adm1021.o
-COBJS-y += ds1621.o
-COBJS-y += ds1722.o
-COBJS-y += ds1775.o
+COBJS-$(CONFIG_DTT_ADM1021) += adm1021.o
+COBJS-$(CONFIG_DTT_DS1621) += ds1621.o
+COBJS-$(CONFIG_DS1722) += ds1722.o

CONFIG_DS1722 does not match the "CONFIG_DTT_foo" idea all other sensors are using. Perhaps you could fix this up too (CONFIG_DS1722 -> CONFIG_DTT_DS1722) with another version of this patch?

Second patch for it seems reasonable for me because there will be change in board config and it will be better to have full change in one commit. I'll do it and send it.

M

#5 lore raw

PATCH 1/1 hwmon: Cleaning hwmon devices

Quoted 12 lines · Michal Simek
Quoted 11 lines

drivers/hwmon/Makefile include $(TOPDIR)/config.mk · line 35

Quoted 7 lines
drivers/hwmon/Makefile +3 -4
-COBJS-y += adm1021.o
-COBJS-y += ds1621.o
-COBJS-y += ds1722.o
-COBJS-y += ds1775.o
+COBJS-$(CONFIG_DTT_ADM1021) += adm1021.o
+COBJS-$(CONFIG_DTT_DS1621) += ds1621.o
+COBJS-$(CONFIG_DS1722) += ds1722.o

CONFIG_DS1722 does not match the "CONFIG_DTT_foo" idea all other sensors are using. Perhaps you could fix this up too (CONFIG_DS1722 -> CONFIG_DTT_DS1722) with another version of this patch?

Quoted 3 lines

Second patch for it seems reasonable for me because there will be change in board config and it will be better to have full change in one commit. I'll do it and send it.

Great, that's what I meant.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

#6 lore raw

PATCH 1/1 hwmon: Cleaning hwmon devices

In reply to monstr at seznam.cz
Quoted 6 lines · monstr at seznam.cz

From: Michal Simek <[email protected]>

Clean Makefile
Move device specific values to driver for better reading

Signed-off-by Michal Simek <[email protected]>
Acked-by Stefan Roese <[email protected]>

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

Applied
#7 lore raw

PATCH 1/1 hwmon: Cleaning hwmon devices

In reply to monstr at seznam.cz
Quoted 6 lines · In message <d50dfd052c733c9d48f0c298a991dd88643f8f83.1215769686.git.monstr@mons…

From: Michal Simek <[email protected]>

Clean Makefile
Move device specific values to driver for better reading

Signed-off-by Michal Simek <[email protected]>
Quoted 11 lines
---
 drivers/hwmon/Makefile  |   12 ++++----
 drivers/hwmon/adm1021.c |   35 +++++++++++++++++++--
 drivers/hwmon/ds1621.c  |   12 +++++--
 drivers/hwmon/ds1722.c  |    5 ---
 drivers/hwmon/ds1775.c  |    8 ++--
 drivers/hwmon/lm73.c    |    6 ++++
 drivers/hwmon/lm75.c    |    8 ++--
 drivers/hwmon/lm81.c    |    8 +++--
 include/dtt.h           |   77 +---------------------------------------------
 9 files changed, 66 insertions(+), 105 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It is surely a great calamity for  a  human  being  to  have  no  ob-
sessions.                                                - Robert Bly
author
#8 lore raw

PATCH 1/1 FIS: repare incorrect return value with ramdisk handling

In reply to monstr at seznam.cz

oou. this patches I sent twice because I used git-send-email with 0001* and I had two files there. :-( Sorry for that.

M

From: Michal Simek <[email protected]>

Microblaze and PowerPC use boot_get_ramdisk for loading ramdisk to memory with checking return value. Return 0 means success. Return 1 means failed. Here is correspond part of code from bootm.c which check return code.

ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC,

		&rd_data_start, &rd_data_end);
if (ret)
	goto error;
Signed-off-by Michal Simek <[email protected]>
---
 common/image.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
common/image.c +0 -0
index 4a024d4..4a4472f 100644
@@ -826,13 +826,13 @@ int boot_get_ramdisk (int argc, char *argv[],

bootm_headers_t *images,
cfg_noffset = fit_conf_get_node (fit_hdr, fit_uname_config); if (cfg_noffset < 0) {
debug ("* ramdisk: no such config\n");
- return 0;
+ return 1;
}

rd_noffset = fit_conf_get_ramdisk_node (fit_hdr, cfg_noffset); if (rd_noffset < 0) {
debug ("* ramdisk: no ramdisk in config\n");
- return 0;
+ return 1;
}
}
#endif
@@ -871,7 +871,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
if (!fit_check_format (fit_hdr)) {
puts ("Bad FIT ramdisk image format!\n"); show_boot_progress (-120);
- return 0;
+ return 1;
}
show_boot_progress (121);

@@ -886,7 +886,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
if (cfg_noffset < 0) {
puts ("Could not find configuration node\n"); show_boot_progress (-122);
- return 0;
+ return 1;
}
fit_uname_config = fdt_get_name (fit_hdr, cfg_noffset, NULL);
printf (" Using '%s' configuration\n", fit_uname_config);
@@ -901,20 +901,20 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
if (rd_noffset < 0) {
puts ("Could not find subimage node\n"); show_boot_progress (-124);
- return 0;
+ return 1;
}

printf (" Trying '%s' ramdisk subimage\n", fit_uname_ramdisk);

show_boot_progress (125);
if (!fit_check_ramdisk (fit_hdr, rd_noffset, arch, images->verify))
- return 0;
+ return 1;

/* get ramdisk image data address and length */ if (fit_image_get_data (fit_hdr, rd_noffset, &data, &size)) {
puts ("Could not find ramdisk subimage data!\n"); show_boot_progress (-127);
- return 0;
+ return 1;
}
show_boot_progress (128);

@@ -924,7 +924,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
if (fit_image_get_load (fit_hdr, rd_noffset, &rd_load)) {
puts ("Can't get ramdisk subimage load address!\n"); show_boot_progress (-129);
- return 0;
+ return 1;
}
show_boot_progress (129);

Signature · 12 lines
1.5.4.GIT


-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
#9 lore raw

PATCH 1/1 FIS: repare incorrect return value with ramdisk handling

In reply to monstr at seznam.cz
Quoted 9 lines · In message <[email protected]> you wrote:

From: Michal Simek <[email protected]>

Microblaze and PowerPC use boot_get_ramdisk for loading ramdisk to memory with checking return value. Return 0 means success. Return 1 means failed. Here is correspond part of code from bootm.c which check return code.

ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC,

Quoted 8 lines
		&rd_data_start, &rd_data_end);
if (ret)
	goto error;
Signed-off-by Michal Simek <[email protected]>
---
 common/image.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

As far as I can tell this is exactly the same patch as submitted earlier. I think this was just by mistake?

I committed the first one - please check.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Even if you aren't in doubt, consider the mental welfare of the  per-
son who has to maintain the code after you, and who will probably put
parens in the wrong place.          - Larry Wall in the perl man page
author
#10 lore raw

PATCH 1/1 FIS: repare incorrect return value with ramdisk handling

Look good.

Thanks,
Michal Simek

Quoted 28 lines
Quoted 9 lines · In message <[email protected]> you wrote:

From: Michal Simek <[email protected]>

Microblaze and PowerPC use boot_get_ramdisk for loading ramdisk to memory with checking return value. Return 0 means success. Return 1 means failed. Here is correspond part of code from bootm.c which check return code.

ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC,

Quoted 8 lines
		&rd_data_start, &rd_data_end);
if (ret)
	goto error;
Signed-off-by Michal Simek <[email protected]>
---
 common/image.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

As far as I can tell this is exactly the same patch as submitted earlier. I think this was just by mistake?

I committed the first one - please check.

Best regards,

Wolfgang Denk