karo: tx48: only print message about cpu_clk, if it was actually changed

[karo-tx-uboot.git] / disk / part_amiga.c

diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 07b32107d600e4e36f73a3d9331b7bc1d1185d61..260a3d5e87c8eac903403fc904e73e440ed61111 100644 (file)
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -3,30 +3,14 @@
  * Hans-Joerg Frieden, Hyperion Entertainment
  * Hans-JoergF@hyperion-entertainment.com
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <command.h>
 #include <ide.h>
 #include "part_amiga.h"
 
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_AMIGA_PARTITION)
+#ifdef HAVE_BLOCK_DEVICE
 
 #undef AMIGA_DEBUG
 
@@ -150,7 +134,7 @@ struct rigid_disk_block *get_rdisk(block_dev_desc_t *dev_desc)
 
     s = getenv("amiga_scanlimit");
     if (s)
-       limit = atoi(s);
+       limit = simple_strtoul(s, NULL, 10);
     else
        limit = AMIGA_BLOCK_LIMIT;
 
@@ -191,7 +175,7 @@ struct bootcode_block *get_bootcode(block_dev_desc_t *dev_desc)
 
     s = getenv("amiga_scanlimit");
     if (s)
-       limit = atoi(s);
+       limit = simple_strtoul(s, NULL, 10);
     else
        limit = AMIGA_BLOCK_LIMIT;