X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=disk%2Fpart_amiga.c;h=260a3d5e87c8eac903403fc904e73e440ed61111;hp=d55249f6fe966e7eb6c209e2cd920e3897df9b3a;hb=f991f7c69dbeda644e465da2b83c507bd18853f2;hpb=45cdb9b72c94655c7308b464a2666057c0b286e0 diff --git a/disk/part_amiga.c b/disk/part_amiga.c index d55249f6fe..260a3d5e87 100644 --- a/disk/part_amiga.c +++ b/disk/part_amiga.c @@ -3,34 +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 #include #include #include "part_amiga.h" -#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE) || \ - (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI) || \ - (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION) +#ifdef HAVE_BLOCK_DEVICE #undef AMIGA_DEBUG @@ -154,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; @@ -195,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;